kopia lustrzana https://github.com/collective/icalendar
all pep8
rodzic
70a7b5a167
commit
9e26485f6d
|
@ -20,6 +20,9 @@ Fixes:
|
|||
- Documentation fixes.
|
||||
[TomTry]
|
||||
|
||||
- Pep 8.
|
||||
[thet]
|
||||
|
||||
|
||||
3.9.1 (2015-09-08)
|
||||
------------------
|
||||
|
|
|
@ -72,7 +72,7 @@ class Component(CaselessDict):
|
|||
# component, we will silently ignore
|
||||
# it, rather than let the exception
|
||||
# propagate upwards
|
||||
# not_compliant = [''] # List of non-compliant properties.
|
||||
# not_compliant = [''] # List of non-compliant properties.
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""Set keys to upper for initial dict.
|
||||
|
@ -81,7 +81,7 @@ class Component(CaselessDict):
|
|||
# set parameters here for properties that use non-default values
|
||||
self.subcomponents = [] # Components can be nested.
|
||||
self.errors = list() # If we ignored exception(s) while
|
||||
# parsing a property, contains error strings
|
||||
# parsing a property, contains error strings
|
||||
|
||||
# def is_compliant(self, name):
|
||||
# """Returns True is the given property name is compliant with the
|
||||
|
|
|
@ -21,8 +21,8 @@ def canonsort_keys(keys, canonical_order=None):
|
|||
def canonsort_items(dict1, canonical_order=None):
|
||||
"""Returns a list of items from dict1, sorted by canonical_order.
|
||||
"""
|
||||
return [(k, dict1[k]) for \
|
||||
k in canonsort_keys(dict1.keys(), canonical_order)]
|
||||
return [(k, dict1[k]) for k
|
||||
in canonsort_keys(dict1.keys(), canonical_order)]
|
||||
|
||||
|
||||
class CaselessDict(OrderedDict):
|
||||
|
|
|
@ -78,8 +78,9 @@ def foldline(line, limit=75, fold_sep=u'\r\n '):
|
|||
except (UnicodeEncodeError, UnicodeDecodeError):
|
||||
pass
|
||||
else:
|
||||
return fold_sep.join(line[i:i+limit-1] for i in
|
||||
range(0, len(line), limit-1))
|
||||
return fold_sep.join(
|
||||
line[i:i + limit - 1] for i in range(0, len(line), limit - 1)
|
||||
)
|
||||
|
||||
ret_chars = []
|
||||
byte_count = 0
|
||||
|
|
|
@ -318,10 +318,12 @@ class vDDDTypes(object):
|
|||
return vDatetime.from_ical(ical, timezone=timezone)
|
||||
elif len(ical) == 8:
|
||||
return vDate.from_ical(ical)
|
||||
elif len(ical) in (6,7):
|
||||
elif len(ical) in (6, 7):
|
||||
return vTime.from_ical(ical)
|
||||
else:
|
||||
raise ValueError("Expected datetime, date, or time, got: '%s'" % ical)
|
||||
raise ValueError(
|
||||
"Expected datetime, date, or time, got: '%s'" % ical
|
||||
)
|
||||
|
||||
|
||||
class vDate(object):
|
||||
|
@ -557,7 +559,7 @@ class vWeekday(compat.unicode_type):
|
|||
sign = match['signal']
|
||||
weekday = match['weekday']
|
||||
relative = match['relative']
|
||||
if not weekday in vWeekday.week_days or sign not in '+-':
|
||||
if weekday not in vWeekday.week_days or sign not in '+-':
|
||||
raise ValueError('Expected weekday abbrevation, got: %s' % self)
|
||||
self.relative = relative and int(relative) or None
|
||||
self.params = Parameters()
|
||||
|
@ -591,7 +593,7 @@ class vFrequency(compat.unicode_type):
|
|||
def __new__(cls, value, encoding=DEFAULT_ENCODING):
|
||||
value = to_unicode(value, encoding=encoding)
|
||||
self = super(vFrequency, cls).__new__(cls, value)
|
||||
if not self in vFrequency.frequencies:
|
||||
if self not in vFrequency.frequencies:
|
||||
raise ValueError('Expected frequency, got: %s' % self)
|
||||
self.params = Parameters()
|
||||
return self
|
||||
|
|
|
@ -200,8 +200,9 @@ X
|
|||
END:VEVENT"""
|
||||
event = icalendar.Calendar.from_ical(ical_str)
|
||||
self.assertTrue(isinstance(event, icalendar.Event))
|
||||
self.assertEqual(event.errors,
|
||||
[(None, "Content line could not be parsed into parts: 'X': Invalid content line")]
|
||||
self.assertEqual(
|
||||
event.errors,
|
||||
[(None, "Content line could not be parsed into parts: 'X': Invalid content line")] # noqa
|
||||
)
|
||||
|
||||
def test_issue_104__no_ignore_exceptions(self):
|
||||
|
|
|
@ -164,13 +164,17 @@ class TestTimezoneCreation(unittest.TestCase):
|
|||
ny_transition_times = list()
|
||||
ny_transition_info = list()
|
||||
for num, date in enumerate(pytz_new_york._utc_transition_times):
|
||||
if datetime.datetime(1967, 4, 30, 7, 0) <= date <= datetime.datetime(2037, 11, 1, 6, 0):
|
||||
if datetime.datetime(1967, 4, 30, 7, 0)\
|
||||
<= date <= datetime.datetime(2037, 11, 1, 6, 0):
|
||||
ny_transition_times.append(date)
|
||||
ny_transition_info.append(pytz_new_york._transition_info[num])
|
||||
self.assertEqual(tz._utc_transition_times[:142], ny_transition_times)
|
||||
self.assertEqual(tz._transition_info[0:142], ny_transition_info)
|
||||
self.assertIn(
|
||||
(datetime.timedelta(-1, 72000), datetime.timedelta(0, 3600), 'EDT'),
|
||||
(
|
||||
datetime.timedelta(-1, 72000),
|
||||
datetime.timedelta(0, 3600), 'EDT'
|
||||
),
|
||||
tz._tzinfos.keys()
|
||||
)
|
||||
self.assertIn(
|
||||
|
@ -259,21 +263,58 @@ class TestTimezoneCreation(unittest.TestCase):
|
|||
)
|
||||
self.assertEqual(
|
||||
tz._transition_info,
|
||||
[(datetime.timedelta(0, 43200), datetime.timedelta(0), 'custom_Pacific/Fiji_19151026T000000')] +
|
||||
3 * [(datetime.timedelta(0, 46800), datetime.timedelta(0, 3600), 'custom_Pacific/Fiji_19981101T020000'),
|
||||
(datetime.timedelta(0, 43200), datetime.timedelta(0), 'custom_Pacific/Fiji_19990228T030000'), ] +
|
||||
3 * [(datetime.timedelta(0, 46800), datetime.timedelta(0, 3600), 'custom_Pacific/Fiji_20101024T020000'),
|
||||
(datetime.timedelta(0, 43200), datetime.timedelta(0), 'custom_Pacific/Fiji_19990228T030000'), ] +
|
||||
25 * [(datetime.timedelta(0, 46800), datetime.timedelta(0, 3600), 'custom_Pacific/Fiji_20101024T020000'),
|
||||
(datetime.timedelta(0, 43200), datetime.timedelta(0), 'custom_Pacific/Fiji_20140119T020000'), ] +
|
||||
[(datetime.timedelta(0, 46800), datetime.timedelta(0, 3600), 'custom_Pacific/Fiji_20101024T020000')]
|
||||
[(
|
||||
datetime.timedelta(0, 43200),
|
||||
datetime.timedelta(0),
|
||||
'custom_Pacific/Fiji_19151026T000000'
|
||||
)] +
|
||||
3 * [(
|
||||
datetime.timedelta(0, 46800),
|
||||
datetime.timedelta(0, 3600),
|
||||
'custom_Pacific/Fiji_19981101T020000'
|
||||
), (
|
||||
datetime.timedelta(0, 43200),
|
||||
datetime.timedelta(0),
|
||||
'custom_Pacific/Fiji_19990228T030000')
|
||||
] +
|
||||
3 * [(
|
||||
datetime.timedelta(0, 46800),
|
||||
datetime.timedelta(0, 3600),
|
||||
'custom_Pacific/Fiji_20101024T020000'
|
||||
), (
|
||||
datetime.timedelta(0, 43200),
|
||||
datetime.timedelta(0),
|
||||
'custom_Pacific/Fiji_19990228T030000'
|
||||
)] +
|
||||
25 * [(
|
||||
datetime.timedelta(0, 46800),
|
||||
datetime.timedelta(0, 3600),
|
||||
'custom_Pacific/Fiji_20101024T020000'
|
||||
), (
|
||||
datetime.timedelta(0, 43200),
|
||||
datetime.timedelta(0),
|
||||
'custom_Pacific/Fiji_20140119T020000'
|
||||
)] +
|
||||
[(
|
||||
datetime.timedelta(0, 46800),
|
||||
datetime.timedelta(0, 3600),
|
||||
'custom_Pacific/Fiji_20101024T020000'
|
||||
)]
|
||||
)
|
||||
|
||||
self.assertIn(
|
||||
(datetime.timedelta(0, 46800), datetime.timedelta(0, 3600), 'custom_Pacific/Fiji_19981101T020000'),
|
||||
(
|
||||
datetime.timedelta(0, 46800),
|
||||
datetime.timedelta(0, 3600),
|
||||
'custom_Pacific/Fiji_19981101T020000'
|
||||
),
|
||||
tz._tzinfos.keys()
|
||||
)
|
||||
self.assertIn(
|
||||
(datetime.timedelta(0, 43200), datetime.timedelta(0), 'custom_Pacific/Fiji_19990228T030000'),
|
||||
(
|
||||
datetime.timedelta(0, 43200),
|
||||
datetime.timedelta(0),
|
||||
'custom_Pacific/Fiji_19990228T030000'
|
||||
),
|
||||
tz._tzinfos.keys()
|
||||
)
|
||||
|
|
|
@ -33,7 +33,7 @@ class TestCalComponent(unittest.TestCase):
|
|||
'PRODID': '-//max m//icalendar.mxm.dk/'})
|
||||
)
|
||||
|
||||
### ADD MULTIPLE VALUES TO A PROPERTY
|
||||
# ## ADD MULTIPLE VALUES TO A PROPERTY
|
||||
|
||||
# if you use the add method you don't have to considder if a value is
|
||||
# a list or not.
|
||||
|
@ -422,4 +422,4 @@ class TestCal(unittest.TestCase):
|
|||
[e.errors
|
||||
for e in icalendar.cal.Calendar.from_ical(s).walk('VEVENT')],
|
||||
[[], [('EXDATE', "Expected datetime, date, or time, got: ''")]]
|
||||
)
|
||||
)
|
||||
|
|
|
@ -59,7 +59,7 @@ class TestCaselessdict(unittest.TestCase):
|
|||
|
||||
def test_caselessdict_copy(self):
|
||||
CaselessDict = icalendar.caselessdict.CaselessDict
|
||||
|
||||
|
||||
original_dict = CaselessDict(key1='val1', key2='val2')
|
||||
copied_dict = original_dict.copy()
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue