[Python-checkins] Further de-linting of zoneinfo module (#20499)
Paul Ganssle
webhook-mailer at python.org
Fri May 29 09:34:38 EDT 2020
https://github.com/python/cpython/commit/364b5ead1584583db91ef7f9d9f87f01bfbb5774
commit: 364b5ead1584583db91ef7f9d9f87f01bfbb5774
branch: master
author: Paul Ganssle <paul at ganssle.io>
committer: GitHub <noreply at github.com>
date: 2020-05-29T09:34:30-04:00
summary:
Further de-linting of zoneinfo module (#20499)
* Remove unused imports in zoneinfo
* Remove unused variables in zoneinfo
* Remove else after raise
files:
M Lib/test/test_zoneinfo/test_zoneinfo.py
M Lib/zoneinfo/_common.py
M Lib/zoneinfo/_tzpath.py
M Lib/zoneinfo/_zoneinfo.py
diff --git a/Lib/test/test_zoneinfo/test_zoneinfo.py b/Lib/test/test_zoneinfo/test_zoneinfo.py
index fe2c380c51442..1f1fa60f1ffc1 100644
--- a/Lib/test/test_zoneinfo/test_zoneinfo.py
+++ b/Lib/test/test_zoneinfo/test_zoneinfo.py
@@ -19,12 +19,7 @@
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 @@ def test_folds_and_gaps(self):
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 @@ def populate_tzstr_header(cls):
# 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 @@ def zone_from_tzstr(self, tzstr):
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)
diff --git a/Lib/zoneinfo/_common.py b/Lib/zoneinfo/_common.py
index 3d35d4f4b463f..41c898f37e4f8 100644
--- a/Lib/zoneinfo/_common.py
+++ b/Lib/zoneinfo/_common.py
@@ -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)
diff --git a/Lib/zoneinfo/_tzpath.py b/Lib/zoneinfo/_tzpath.py
index 9e381b6e4434b..9513611c17738 100644
--- a/Lib/zoneinfo/_tzpath.py
+++ b/Lib/zoneinfo/_tzpath.py
@@ -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:
diff --git a/Lib/zoneinfo/_zoneinfo.py b/Lib/zoneinfo/_zoneinfo.py
index b207dd346fe25..7b1718a0676e1 100644
--- a/Lib/zoneinfo/_zoneinfo.py
+++ b/Lib/zoneinfo/_zoneinfo.py
@@ -4,7 +4,7 @@
import functools
import re
import weakref
-from datetime import datetime, timedelta, timezone, tzinfo
+from datetime import datetime, timedelta, tzinfo
from . import _common, _tzpath
More information about the Python-checkins
mailing list