Further de-linting of zoneinfo module (#20499)

* Remove unused imports in zoneinfo

* Remove unused variables in zoneinfo

* Remove else after raise
This commit is contained in:
Paul Ganssle 2020-05-29 09:34:30 -04:00 committed by GitHub
parent 895c9c1d43
commit 364b5ead15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 12 deletions

View File

@ -19,12 +19,7 @@ from datetime import date, datetime, time, timedelta, timezone
from functools import cached_property
from . import _support as test_support
from ._support import (
OS_ENV_LOCK,
TZPATH_LOCK,
TZPATH_TEST_LOCK,
ZoneInfoTestBase,
)
from ._support import OS_ENV_LOCK, TZPATH_TEST_LOCK, ZoneInfoTestBase
py_zoneinfo, c_zoneinfo = test_support.get_modules()
@ -365,7 +360,6 @@ class ZoneInfoTest(TzPathUserMixin, ZoneInfoTestBase):
self.assertEqual(dt.dst(), offset.dst, dt)
def test_folds_from_utc(self):
tests = []
for key in self.zones():
zi = self.zone_from_key(key)
with self.subTest(key=key):
@ -927,7 +921,7 @@ class TZStrTest(ZoneInfoTestBase):
# the Version 2+ file. In this case, we have no transitions, just
# the tzstr in the footer, so up to the footer, the files are
# identical and we can just write the same file twice in a row.
for i in range(2):
for _ in range(2):
out += b"TZif" # Magic value
out += b"3" # Version
out += b" " * 15 # Reserved
@ -952,7 +946,6 @@ class TZStrTest(ZoneInfoTestBase):
return self.klass.from_file(zonefile, key=tzstr)
def test_tzstr_localized(self):
i = 0
for tzstr, cases in self.test_cases.items():
with self.subTest(tzstr=tzstr):
zi = self.zone_from_tzstr(tzstr)

View File

@ -80,7 +80,6 @@ def load_data(fobj):
# not by position in the array but by position in the unsplit
# abbreviation string. I suppose this makes more sense in C, which uses
# null to terminate the strings, but it's inconvenient here...
char_total = 0
abbr_vals = {}
abbr_chars = fobj.read(charcnt)

View File

@ -12,7 +12,8 @@ def reset_tzpath(to=None):
f"tzpaths must be a list or tuple, "
+ f"not {type(tzpaths)}: {tzpaths!r}"
)
elif not all(map(os.path.isabs, tzpaths)):
if not all(map(os.path.isabs, tzpaths)):
raise ValueError(_get_invalid_paths_message(tzpaths))
base_tzpath = tzpaths
else:

View File

@ -4,7 +4,7 @@ import collections
import functools
import re
import weakref
from datetime import datetime, timedelta, timezone, tzinfo
from datetime import datetime, timedelta, tzinfo
from . import _common, _tzpath