diff --git a/remove-six.patch b/remove-six.patch index 3f05497..f26073c 100644 --- a/remove-six.patch +++ b/remove-six.patch @@ -14,7 +14,7 @@ src/dateutil/tz/_common.py | 15 ---------- src/dateutil/tz/_factories.py | 3 -- src/dateutil/tz/tz.py | 18 ++++-------- - src/dateutil/tz/win.py | 7 +---- + src/dateutil/tz/win.py | 8 ++--- src/python_dateutil.egg-info/requires.txt | 1 tests/property/test_tz_prop.py | 6 ---- tests/test_imports.py | 9 +----- @@ -23,7 +23,7 @@ tests/test_rrule.py | 40 ---------------------------- tests/test_tz.py | 6 ---- updatezinfo.py | 4 +- - 24 files changed, 52 insertions(+), 166 deletions(-) + 24 files changed, 53 insertions(+), 166 deletions(-) --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -507,17 +507,18 @@ if os.path.isabs(name): --- a/src/dateutil/tz/win.py +++ b/src/dateutil/tz/win.py -@@ -10,9 +10,6 @@ Attempting to import this module on a no +@@ -9,9 +9,7 @@ Attempting to import this module on a no + # This code was originally contributed by Jeffrey Harris. import datetime import struct - +- -from six.moves import winreg -from six import text_type -- ++import winreg + try: import ctypes - from ctypes import wintypes -@@ -216,7 +213,7 @@ class tzwin(tzwinbase): +@@ -216,7 +214,7 @@ class tzwin(tzwinbase): self._name = name with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle: @@ -526,7 +527,7 @@ with winreg.OpenKey(handle, tzkeyname) as tzkey: keydict = valuestodict(tzkey) -@@ -282,7 +279,7 @@ class tzwinlocal(tzwinbase): +@@ -282,7 +280,7 @@ class tzwinlocal(tzwinbase): self._dst_abbr = keydict["DaylightName"] try: