diff --git a/debian/changelog b/debian/changelog index e6664003466d1ed46ae28d915b52af50bca18828..070d7b4c6b55eb43c0ab878c4a251d035ac862fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-dateutil (2.8.2-2) unstable; urgency=medium + + * Team upload. + + [ Arnout Vandecappelle ] + * Don't fall back on bundled zoneinfo database (Closes: #1003044) + + -- Felix Geyer <fgeyer@debian.org> Fri, 17 Mar 2023 17:05:45 +0100 + python-dateutil (2.8.2-1) unstable; urgency=medium * Team upload diff --git a/debian/patches/Remove_Zoneinfo_Tarball.patch b/debian/patches/Remove_Zoneinfo_Tarball.patch index 70c3f328cf05277bdd3f36edfc084232540b20ec..4235b5aa0a5ba5274b39f4a63a0d604bc06590c1 100644 --- a/debian/patches/Remove_Zoneinfo_Tarball.patch +++ b/debian/patches/Remove_Zoneinfo_Tarball.patch @@ -1,13 +1,15 @@ -From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org> +From 49f1a86aa7989e497114437dfef8ad51d5b413fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> Date: Sat, 27 Sep 2014 20:52:15 +0200 -Subject: Remove Zoneinfo Tarball +Subject: [PATCH] Remove Zoneinfo Tarball --- MANIFEST.in | 1 + dateutil/test/test_tz.py | 2 ++ + dateutil/tz/tz.py | 4 ---- python_dateutil.egg-info/SOURCES.txt | 3 +-- setup.cfg | 3 --- - 4 files changed, 4 insertions(+), 5 deletions(-) + 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index d4d9f32..3e8b3fb 100644 @@ -19,7 +21,7 @@ index d4d9f32..3e8b3fb 100644 global-exclude *.py[co] +exclude dateutil/zoneinfo/dateutil-zoneinfo.tar.gz diff --git a/dateutil/test/test_tz.py b/dateutil/test/test_tz.py -index 6cd8ea0..042f28e 100644 +index e5e4772..fa84872 100644 --- a/dateutil/test/test_tz.py +++ b/dateutil/test/test_tz.py @@ -1193,6 +1193,7 @@ def test_gettz_weakref(): @@ -38,8 +40,23 @@ index 6cd8ea0..042f28e 100644 def testPickleZoneFileGettz(self): zoneinfo_file = zoneinfo.get_zonefile_instance() tzi = zoneinfo_file.get('America/New_York') +diff --git a/dateutil/tz/tz.py b/dateutil/tz/tz.py +index c67f56d..e350cdb 100644 +--- a/dateutil/tz/tz.py ++++ b/dateutil/tz/tz.py +@@ -1650,10 +1650,6 @@ def __get_gettz(): + # UnicodeEncodeError is for Python 2.7 compat + tz = None + +- if not tz: +- from dateutil.zoneinfo import get_zonefile_instance +- tz = get_zonefile_instance().get(name) +- + if not tz: + for c in name: + # name is not a tzstr unless it has at least diff --git a/python_dateutil.egg-info/SOURCES.txt b/python_dateutil.egg-info/SOURCES.txt -index c0d2a0f..ae4d43f 100644 +index c8e5497..a0ccdca 100644 --- a/python_dateutil.egg-info/SOURCES.txt +++ b/python_dateutil.egg-info/SOURCES.txt @@ -60,7 +60,6 @@ dateutil/tz/_factories.py @@ -58,7 +75,7 @@ index c0d2a0f..ae4d43f 100644 \ No newline at end of file +requirements/3.3/requirements-dev.txt diff --git a/setup.cfg b/setup.cfg -index a5fe172..330b7cb 100644 +index 33283f9..f815c88 100644 --- a/setup.cfg +++ b/setup.cfg @@ -45,9 +45,6 @@ test_suite = dateutil.test