types.ListType and types.TupleType are aliases of the the built-in list and tuple.

Removed a forgotten pdb line.
pull/95/head
Victor Varvaryuk 2013-03-18 11:02:59 +04:00
rodzic 99cdf7da01
commit e8c88c1405
3 zmienionych plików z 7 dodań i 20 usunięć

Wyświetl plik

@ -7,10 +7,6 @@ These are the defined components.
"""
import pytz
from datetime import datetime
from types import (
ListType,
TupleType,
)
from icalendar.caselessdict import CaselessDict
from icalendar.parser import (
Contentlines,
@ -25,7 +21,7 @@ from icalendar.prop import (
)
SequenceTypes = (ListType, TupleType)
SequenceTypes = (list, tuple)
######################################
@ -247,7 +243,7 @@ class Component(CaselessDict):
return obj
def set(self, name, value, encode=1):
if encode and type(value) == ListType\
if encode and isinstance(value, list) \
and name.lower() not in ['rdate', 'exdate']:
# Individually convert each value to an ical type except rdate and
# exdate, where lists of dates might be passed to vDDDLists.
@ -293,7 +289,7 @@ class Component(CaselessDict):
if name in self:
oldval = self[name]
value = self._encode(name, value, encode)
if type(oldval) == ListType:
if isinstance(oldval, list):
oldval.append(value)
else:
self.set(name, [oldval, value], encode=0)
@ -309,7 +305,7 @@ class Component(CaselessDict):
"Returns decoded value of property"
if name in self:
value = self[name]
if type(value) == ListType:
if isinstance(value, list):
return [self._decode(name, v) for v in value]
return self._decode(name, value)
else:
@ -380,7 +376,7 @@ class Component(CaselessDict):
property_names = self.sorted_keys()
for name in property_names:
values = self[name]
if type(values) == ListType:
if isinstance(values, list):
# normally one property is one line
for value in values:
properties.append((name, value))

Wyświetl plik

@ -8,15 +8,11 @@ conversion is attempted.
"""
import re
import logging
from types import (
TupleType,
ListType,
)
from icalendar.caselessdict import CaselessDict
logger = logging.getLogger('icalendar')
SequenceTypes = (ListType, TupleType)
SequenceTypes = (list, tuple)
def escape_char(text):

Wyświetl plik

@ -47,10 +47,6 @@ from datetime import (
date,
tzinfo,
)
from types import (
TupleType,
ListType,
)
from dateutil.tz import tzutc
from icalendar.caselessdict import CaselessDict
from icalendar.parser import (
@ -61,7 +57,7 @@ from icalendar.parser import (
)
SequenceTypes = (ListType, TupleType)
SequenceTypes = (list, tuple)
DEFAULT_ENCODING = 'utf-8'
@ -707,7 +703,6 @@ class vText(unicode):
ical_unesc = unescape_char(ical)
return ical_unesc.decode(vText.encoding, 'replace')
except:
import pdb; pdb.set_trace()
raise ValueError('Expected ical text, got: %s' % ical)