diff options
author | Paul Ganssle <pganssle@users.noreply.github.com> | 2017-04-18 09:50:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-18 09:50:07 -0400 |
commit | bf16b41c929afde244033ac0dddccfb7bf8ef8d1 (patch) | |
tree | bf7ef3f3fe8ac2af43757d351dc3a2d146d419b0 | |
parent | 602982649b7ffd9f3611ee79fc343a8b828f0603 (diff) | |
parent | 4a1d4af183ed025aad74f3d01a9e3a557bd28107 (diff) | |
download | dateutil-bf16b41c929afde244033ac0dddccfb7bf8ef8d1.tar.gz |
Merge pull request #376 from jdufresne/flake8-e301
Fix all instances of flake8 E301 & E303
-rw-r--r-- | dateutil/relativedelta.py | 2 | ||||
-rw-r--r-- | dateutil/rrule.py | 1 | ||||
-rw-r--r-- | dateutil/test/test_parser.py | 4 | ||||
-rw-r--r-- | dateutil/test/test_tz.py | 3 | ||||
-rw-r--r-- | dateutil/tz/_common.py | 1 | ||||
-rw-r--r-- | dateutil/tz/tz.py | 1 |
6 files changed, 2 insertions, 10 deletions
diff --git a/dateutil/relativedelta.py b/dateutil/relativedelta.py index 9dfa250..a42746b 100644 --- a/dateutil/relativedelta.py +++ b/dateutil/relativedelta.py @@ -186,7 +186,6 @@ class relativedelta(object): "This is not a well-defined condition and will raise " + "errors in future versions.", DeprecationWarning) - if isinstance(weekday, integer_types): self.weekday = weekdays[weekday] else: @@ -251,6 +250,7 @@ class relativedelta(object): @property def weeks(self): return self.days // 7 + @weeks.setter def weeks(self, value): self.days = self.days - (self.weeks * 7) + value * 7 diff --git a/dateutil/rrule.py b/dateutil/rrule.py index 92e6c4a..120d79c 100644 --- a/dateutil/rrule.py +++ b/dateutil/rrule.py @@ -745,7 +745,6 @@ class rrule(rrulebase): new_kwargs.update(kwargs) return rrule(**new_kwargs) - def _iter(self): year, month, day, hour, minute, second, weekday, yearday, _ = \ self._dtstart.timetuple() diff --git a/dateutil/test/test_parser.py b/dateutil/test/test_parser.py index 9e987be..acd834d 100644 --- a/dateutil/test/test_parser.py +++ b/dateutil/test/test_parser.py @@ -45,7 +45,6 @@ class ParserTest(unittest.TestCase): def read(self, *args, **kwargs): return self.stream.read(*args, **kwargs) - dstr = StringPassThrough(StringIO('2014 January 19')) self.assertEqual(parse(dstr), datetime(2014, 1, 19)) @@ -106,7 +105,6 @@ class ParserTest(unittest.TestCase): datetime(2003, 9, 25, 10, 36, 28, tzinfo=self.brsttz)) - def testDateCommandFormatReversed(self): self.assertEqual(parse("2003 10:36:28 BRST 25 Sep Thu", tzinfos=self.tzinfos), @@ -119,6 +117,7 @@ class ParserTest(unittest.TestCase): tzinfos={"BRST": long(-10800)}), datetime(2003, 9, 25, 10, 36, 28, tzinfo=self.brsttz)) + def testDateCommandFormatIgnoreTz(self): self.assertEqual(parse("Thu Sep 25 10:36:28 BRST 2003", ignoretz=True), @@ -558,7 +557,6 @@ class ParserTest(unittest.TestCase): (datetime(2060, 2, 21, 0, 0, 0), ('http://biz.yahoo.com/ipo/p/', '.html'))) - def testFuzzyAMPMProblem(self): # Sometimes fuzzy parsing results in AM/PM flag being set without # hours - if it's fuzzy it should ignore that. diff --git a/dateutil/test/test_tz.py b/dateutil/test/test_tz.py index b84bd52..16bb129 100644 --- a/dateutil/test/test_tz.py +++ b/dateutil/test/test_tz.py @@ -200,7 +200,6 @@ class TzFoldMixin(object): self.assertEqual(t0_syd0.utcoffset(), timedelta(hours=11)) self.assertEqual(t1_syd1.utcoffset(), timedelta(hours=10)) - def testGapPositiveUTCOffset(self): # Test that we don't have a problem around gaps. tzname = self._get_tzname('Australia/Sydney') @@ -657,7 +656,6 @@ class TzOffsetTest(unittest.TestCase): tzo = tz.tzoffset(tname, -5 * 3600) self.assertEqual(repr(tzo), "tzoffset(" + repr(tname) + ", -18000)") - def testEquality(self): utc = tz.tzoffset('UTC', 0) gmt = tz.tzoffset('GMT', 0) @@ -1319,7 +1317,6 @@ class TZICalTest(unittest.TestCase, TzFoldMixin): self.assertEqual(repr(tzc), "tzical(" + repr(instr.name) + ")") - # Test performance def _test_us_zone(self, tzc, func, values, start): if start: diff --git a/dateutil/tz/_common.py b/dateutil/tz/_common.py index e677598..bea0172 100644 --- a/dateutil/tz/_common.py +++ b/dateutil/tz/_common.py @@ -290,7 +290,6 @@ class tzrangebase(_tzinfo): utc_transitions = (dston, dstoff) dt_utc = dt.replace(tzinfo=None) - isdst = self._naive_isdst(dt_utc, utc_transitions) if isdst: diff --git a/dateutil/tz/tz.py b/dateutil/tz/tz.py index 2b35f7f..20c1a85 100644 --- a/dateutil/tz/tz.py +++ b/dateutil/tz/tz.py @@ -1015,7 +1015,6 @@ class _tzicalvtz(_tzinfo): except ValueError: pass - lastcompdt = None lastcomp = None |