Hello community, here is the log from the commit of package python-pytz for openSUSE:Factory checked in at 2017-03-21 22:43:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytz (Old) and /work/SRC/openSUSE:Factory/.python-pytz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytz" Tue Mar 21 22:43:25 2017 rev:23 rq:481643 version:2016.10 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytz/python-pytz.changes 2016-05-10 09:26:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytz.new/python-pytz.changes 2017-03-21 22:43:26.478589166 +0100 @@ -1,0 +2,19 @@ +Mon Mar 20 19:55:27 UTC 2017 - dims...@opensuse.org + +- Apply pytz-2016.10-fix-tests-with-2017a.patch for Tumbleweed + buildin. + +------------------------------------------------------------------- +Thu Mar 16 02:58:11 UTC 2017 - toddrme2...@gmail.com + +- Implement single-spec version + +------------------------------------------------------------------- +Wed Mar 15 21:33:50 UTC 2017 - astie...@suse.com + +- update to 2016.10: + * includes IANA 2016j + * No longer fails with timezone-2017a bsc#1027705 + add pytz-2016.10-fix-tests-with-2017a.patch + +------------------------------------------------------------------- Old: ---- pytz-2016.4.tar.bz2 pytz-2016.4.tar.bz2.asc New: ---- pytz-2016.10-fix-tests-with-2017a.patch pytz-2016.10.tar.bz2 pytz-2016.10.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytz.spec ++++++ --- /var/tmp/diff_new_pack.tuwnJt/_old 2017-03-21 22:43:27.458450730 +0100 +++ /var/tmp/diff_new_pack.tuwnJt/_new 2017-03-21 22:43:27.458450730 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pytz # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,35 +16,35 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pytz -Version: 2016.4 +Version: 2016.10 Release: 0 Summary: World timezone definitions, modern and historical License: MIT Group: Development/Languages/Python Url: http://pytz.sourceforge.net -Source: https://pypi.python.org/packages/f4/7d/7c0c85e9c64a75dde11bc9d3e1adc4e09a42ce7cdb873baffa1598118709/pytz-2016.4.tar.bz2 -Source2: https://pypi.python.org/packages/f4/7d/7c0c85e9c64a75dde11bc9d3e1adc4e09a42ce7cdb873baffa1598118709/pytz-2016.4.tar.bz2.asc +Source: https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.tar.bz2 +Source2: https://files.pythonhosted.org/packages/source/p/pytz/pytz-%{version}.tar.bz2.asc Source90: pytz.keyring # PATCH-FIX-UPSTREAM fix-tests.patch -- Remote tests which are known to be broken Patch0: fix-tests.patch # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database) Patch1: system_zoneinfo.patch -Requires: timezone +Patch2: pytz-2016.10-fix-tests-with-2017a.patch +BuildRequires: %{python_module devel} BuildRequires: fdupes -BuildRequires: python-devel -BuildRequires: python-nose -# Tests will use this package +BuildRequires: python-rpm-macros +# Test requirements +BuildRequires: %{python_module nose} BuildRequires: timezone +Requires: timezone +Provides: python-tz = 2014b +Obsoletes: python-tz < 2014b BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif -Provides: python-tz = 2014b -Obsoletes: python-tz < 2014b +%python_subpackages %description pytz - World Timezone Definitions for Python @@ -60,28 +60,27 @@ %setup -q -n pytz-%{version} # Disable test which is not working (and documented so) %patch0 -p1 -%if 0%{?suse_version} >= 1310 # Use system tz database %patch1 -p1 +# timezone 2017 a is currently only available in Leap 42.1 and Tumbleweed +%if 0%{?sle_version} == 120100 && 0%{?is_opensuse} || 0%{?suse_version} > 1320 +%patch2 -p2 %endif + # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./pytz/tzfile.py %build -python setup.py build +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -# Remove the pytz zoneinfo only if we use the system tz database -%if 0%{?suse_version} >= 1310 -rm -fr %{buildroot}%{python_sitelib}/pytz/zoneinfo -%endif -%fdupes %{buildroot}%{python_sitelib} +%python_install +%python_expand rm -fr %{buildroot}%{$python_sitelib}/pytz/zoneinfo %check -nosetests +%python_expand nosetests-%{$python_bin_suffix} -%files +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE.txt README.txt %{python_sitelib}/* ++++++ pytz-2016.10-fix-tests-with-2017a.patch ++++++ >From 838d7f06908c14352b0d4f3c5b656d0d95abaf9e Mon Sep 17 00:00:00 2001 From: Andreas Stieger <astie...@suse.com> Date: Wed, 15 Mar 2017 22:23:14 +0100 Subject: [PATCH] test fixes for 2017a numeric zone name changes References: boo#1027705 https://github.com/stub42/pytz/pull/1 https://github.com/stub42/pytz/pull/1/commits/838d7f06908c14352b0d4f3c5b656d0d95abaf9e --- src/pytz/tests/test_tzinfo.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py index 4d26d9ff..21812f6b 100644 --- a/src/pytz/tests/test_tzinfo.py +++ b/src/pytz/tests/test_tzinfo.py @@ -501,7 +501,7 @@ class NoumeaHistoryStartTestCase(USEasternDSTStartTestCase): 'dst': timedelta(0), } after = { - 'tzname': 'NCT', + 'tzname': '+11', 'utcoffset': timedelta(hours=11), 'dst': timedelta(0), } @@ -512,12 +512,12 @@ class NoumeaDSTEndTestCase(USEasternDSTStartTestCase): tzinfo = pytz.timezone('Pacific/Noumea') transition_time = datetime(1997, 3, 1, 15, 00, 00, tzinfo=UTC) before = { - 'tzname': 'NCST', + 'tzname': '+12', 'utcoffset': timedelta(hours=12), 'dst': timedelta(hours=1), } after = { - 'tzname': 'NCT', + 'tzname': '+11', 'utcoffset': timedelta(hours=11), 'dst': timedelta(0), } @@ -541,7 +541,7 @@ class TahitiTestCase(USEasternDSTStartTestCase): 'dst': timedelta(0), } after = { - 'tzname': 'TAHT', + 'tzname': '-10', 'utcoffset': timedelta(hours=-10), 'dst': timedelta(0), } @@ -554,12 +554,12 @@ class SamoaInternationalDateLineChange(USEasternDSTStartTestCase): tzinfo = pytz.timezone('Pacific/Apia') transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC) before = { - 'tzname': 'SDT', + 'tzname': '-10', 'utcoffset': timedelta(hours=-10), 'dst': timedelta(hours=1), } after = { - 'tzname': 'WSDT', + 'tzname': '+14', 'utcoffset': timedelta(hours=14), 'dst': timedelta(hours=1), } @@ -611,7 +611,7 @@ class LocalTestCase(unittest.TestCase): self.assertEqual(loc_time.strftime('%Z%z'), 'NST+0120') loc_time = loc_tz.localize(datetime(1940, 5, 10, 0, 0, 0)) - self.assertEqual(loc_time.strftime('%Z%z'), 'NET+0020') + self.assertEqual(loc_time.strftime('%Z%z'), '+0020+0020') loc_time = loc_tz.localize(datetime(1940, 5, 20, 0, 0, 0)) self.assertEqual(loc_time.strftime('%Z%z'), 'CEST+0200') -- 2.12.0 ++++++ pytz-2016.4.tar.bz2 -> pytz-2016.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/PKG-INFO new/pytz-2016.10/PKG-INFO --- old/pytz-2016.4/PKG-INFO 2016-04-22 15:11:10.000000000 +0200 +++ new/pytz-2016.10/PKG-INFO 2016-12-06 11:00:22.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pytz -Version: 2016.4 +Version: 2016.10 Summary: World timezone definitions, modern and historical Home-page: http://pythonhosted.org/pytz Author: Stuart Bishop @@ -549,10 +549,11 @@ database. The latest version can be downloaded from the `Python Package Index <http://pypi.python.org/pypi/pytz/>`_. The code that is used to generate this distribution is hosted on launchpad.net and available - using the `Bazaar version control system <http://bazaar-vcs.org>`_ - using:: + using git:: - bzr branch lp:pytz + git clone https://git.launchpad.net/pytz + + A mirror on github is also available at https://github.com/stub42/pytz Announcements of new releases are made on `Launchpad <https://launchpad.net/pytz>`_, and the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/README.txt new/pytz-2016.10/README.txt --- old/pytz-2016.4/README.txt 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/README.txt 2016-12-06 10:55:39.000000000 +0100 @@ -540,10 +540,11 @@ database. The latest version can be downloaded from the `Python Package Index <http://pypi.python.org/pypi/pytz/>`_. The code that is used to generate this distribution is hosted on launchpad.net and available -using the `Bazaar version control system <http://bazaar-vcs.org>`_ -using:: +using git:: - bzr branch lp:pytz + git clone https://git.launchpad.net/pytz + +A mirror on github is also available at https://github.com/stub42/pytz Announcements of new releases are made on `Launchpad <https://launchpad.net/pytz>`_, and the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/__init__.py new/pytz-2016.10/pytz/__init__.py --- old/pytz-2016.4/pytz/__init__.py 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/__init__.py 2016-12-06 10:55:39.000000000 +0100 @@ -9,8 +9,8 @@ ''' # The IANA (nee Olson) database is updated several times a year. -OLSON_VERSION = '2016d' -VERSION = '2016.4' # Switching to pip compatible version numbering. +OLSON_VERSION = '2016j' +VERSION = '2016.10' # Switching to pip compatible version numbering. __version__ = VERSION OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling @@ -25,11 +25,6 @@ import sys, datetime, os.path, gettext -try: - from pkg_resources import resource_stream -except ImportError: - resource_stream = None - from pytz.exceptions import AmbiguousTimeError from pytz.exceptions import InvalidTimeError from pytz.exceptions import NonExistentTimeError @@ -57,7 +52,7 @@ ... UnicodeEncodeError: ... """ - s.encode('US-ASCII') # Raise an exception if not ASCII + s.encode('ASCII') # Raise an exception if not ASCII return s # But return the original string - not a byte string. else: # Python 2.x @@ -73,7 +68,7 @@ ... UnicodeEncodeError: ... """ - return s.encode('US-ASCII') + return s.encode('ASCII') def open_resource(name): @@ -88,11 +83,17 @@ raise ValueError('Bad path segment: %r' % part) filename = os.path.join(os.path.dirname(__file__), 'zoneinfo', *name_parts) - if not os.path.exists(filename) and resource_stream is not None: + if not os.path.exists(filename): # http://bugs.launchpad.net/bugs/383171 - we avoid using this # unless absolutely necessary to help when a broken version of # pkg_resources is installed. - return resource_stream(__name__, 'zoneinfo/' + name) + try: + from pkg_resources import resource_stream + except ImportError: + resource_stream = None + + if resource_stream is not None: + return resource_stream(__name__, 'zoneinfo/' + name) return open(filename, 'rb') @@ -404,9 +405,11 @@ def normalize(self, dt, is_dst=False): '''Correct the timezone information on the given datetime''' + if dt.tzinfo is self: + return dt if dt.tzinfo is None: raise ValueError('Naive time - no tzinfo set') - return dt.replace(tzinfo=self) + return dt.astimezone(self) def FixedOffset(offset, _tzinfos = {}): @@ -728,6 +731,7 @@ 'Asia/Aqtobe', 'Asia/Ashgabat', 'Asia/Ashkhabad', + 'Asia/Atyrau', 'Asia/Baghdad', 'Asia/Bahrain', 'Asia/Baku', @@ -748,6 +752,7 @@ 'Asia/Dili', 'Asia/Dubai', 'Asia/Dushanbe', + 'Asia/Famagusta', 'Asia/Gaza', 'Asia/Harbin', 'Asia/Hebron', @@ -813,6 +818,7 @@ 'Asia/Vientiane', 'Asia/Vladivostok', 'Asia/Yakutsk', + 'Asia/Yangon', 'Asia/Yekaterinburg', 'Asia/Yerevan', 'Atlantic/Azores', @@ -952,6 +958,7 @@ 'Europe/Samara', 'Europe/San_Marino', 'Europe/Sarajevo', + 'Europe/Saratov', 'Europe/Simferopol', 'Europe/Skopje', 'Europe/Sofia', @@ -1298,6 +1305,7 @@ 'Asia/Aqtau', 'Asia/Aqtobe', 'Asia/Ashgabat', + 'Asia/Atyrau', 'Asia/Baghdad', 'Asia/Bahrain', 'Asia/Baku', @@ -1314,6 +1322,7 @@ 'Asia/Dili', 'Asia/Dubai', 'Asia/Dushanbe', + 'Asia/Famagusta', 'Asia/Gaza', 'Asia/Hebron', 'Asia/Ho_Chi_Minh', @@ -1348,7 +1357,6 @@ 'Asia/Pyongyang', 'Asia/Qatar', 'Asia/Qyzylorda', - 'Asia/Rangoon', 'Asia/Riyadh', 'Asia/Sakhalin', 'Asia/Samarkand', @@ -1369,6 +1377,7 @@ 'Asia/Vientiane', 'Asia/Vladivostok', 'Asia/Yakutsk', + 'Asia/Yangon', 'Asia/Yekaterinburg', 'Asia/Yerevan', 'Atlantic/Azores', @@ -1441,6 +1450,7 @@ 'Europe/Samara', 'Europe/San_Marino', 'Europe/Sarajevo', + 'Europe/Saratov', 'Europe/Simferopol', 'Europe/Skopje', 'Europe/Sofia', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/tests/test_docs.py new/pytz-2016.10/pytz/tests/test_docs.py --- old/pytz-2016.4/pytz/tests/test_docs.py 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/tests/test_docs.py 2016-12-06 10:55:39.000000000 +0100 @@ -13,7 +13,7 @@ '''Confirm the README.txt is pure ASCII.''' f = open(README, 'rb') try: - f.read().decode('US-ASCII') + f.read().decode('ASCII') finally: f.close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/tests/test_tzinfo.py new/pytz-2016.10/pytz/tests/test_tzinfo.py --- old/pytz-2016.4/pytz/tests/test_tzinfo.py 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/tests/test_tzinfo.py 2016-12-06 10:55:39.000000000 +0100 @@ -21,8 +21,8 @@ # I test for expected version to ensure the correct version of pytz is # actually being tested. -EXPECTED_VERSION='2016.4' -EXPECTED_OLSON_VERSION='2016d' +EXPECTED_VERSION='2016.10' +EXPECTED_OLSON_VERSION='2016j' fmt = '%Y-%m-%d %H:%M:%S %Z%z' @@ -114,6 +114,12 @@ eastern = pytz.timezone('US/Eastern') self.assertTrue(eastern is pytz.timezone(unicode('US/Eastern'))) + def testStaticTzInfo(self): + # Ensure that static timezones are correctly detected, + # per lp:1602807 + static = pytz.timezone('Etc/GMT-4') + self.assertTrue(isinstance(static, StaticTzInfo)) + class PicklingTest(unittest.TestCase): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/tzfile.py new/pytz-2016.10/pytz/tzfile.py --- old/pytz-2016.4/pytz/tzfile.py 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/tzfile.py 2016-12-06 10:55:39.000000000 +0100 @@ -15,13 +15,13 @@ def _byte_string(s): """Cast a string or byte string to an ASCII byte string.""" - return s.encode('US-ASCII') + return s.encode('ASCII') _NULL = _byte_string('\0') def _std_string(s): """Cast a string or byte string to an ASCII string.""" - return str(s.decode('US-ASCII')) + return str(s.decode('ASCII')) def build_tzinfo(zone, fp): head_fmt = '>4s c 15x 6l' @@ -66,7 +66,7 @@ i += 3 # Now build the timezone object - if len(transitions) == 0: + if len(ttinfo) ==1 or len(transitions) == 0: ttinfo[0][0], ttinfo[0][2] cls = type(zone, (StaticTzInfo,), dict( zone=zone, Binary files old/pytz-2016.4/pytz/zoneinfo/Africa/Casablanca and new/pytz-2016.10/pytz/zoneinfo/Africa/Casablanca differ Binary files old/pytz-2016.4/pytz/zoneinfo/Africa/El_Aaiun and new/pytz-2016.10/pytz/zoneinfo/Africa/El_Aaiun differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Cambridge_Bay and new/pytz-2016.10/pytz/zoneinfo/America/Cambridge_Bay differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Ensenada and new/pytz-2016.10/pytz/zoneinfo/America/Ensenada differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Inuvik and new/pytz-2016.10/pytz/zoneinfo/America/Inuvik differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Iqaluit and new/pytz-2016.10/pytz/zoneinfo/America/Iqaluit differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Los_Angeles and new/pytz-2016.10/pytz/zoneinfo/America/Los_Angeles differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Pangnirtung and new/pytz-2016.10/pytz/zoneinfo/America/Pangnirtung differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Rankin_Inlet and new/pytz-2016.10/pytz/zoneinfo/America/Rankin_Inlet differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Resolute and new/pytz-2016.10/pytz/zoneinfo/America/Resolute differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Santa_Isabel and new/pytz-2016.10/pytz/zoneinfo/America/Santa_Isabel differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Tijuana and new/pytz-2016.10/pytz/zoneinfo/America/Tijuana differ Binary files old/pytz-2016.4/pytz/zoneinfo/America/Yellowknife and new/pytz-2016.10/pytz/zoneinfo/America/Yellowknife differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Casey and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Casey differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Davis and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Davis differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/DumontDUrville and new/pytz-2016.10/pytz/zoneinfo/Antarctica/DumontDUrville differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Macquarie and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Macquarie differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Mawson and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Mawson differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Palmer and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Palmer differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Rothera and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Rothera differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Syowa and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Syowa differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Troll and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Troll differ Binary files old/pytz-2016.4/pytz/zoneinfo/Antarctica/Vostok and new/pytz-2016.10/pytz/zoneinfo/Antarctica/Vostok differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Almaty and new/pytz-2016.10/pytz/zoneinfo/Asia/Almaty differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Anadyr and new/pytz-2016.10/pytz/zoneinfo/Asia/Anadyr differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Aqtau and new/pytz-2016.10/pytz/zoneinfo/Asia/Aqtau differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Aqtobe and new/pytz-2016.10/pytz/zoneinfo/Asia/Aqtobe differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Ashgabat and new/pytz-2016.10/pytz/zoneinfo/Asia/Ashgabat differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Ashkhabad and new/pytz-2016.10/pytz/zoneinfo/Asia/Ashkhabad differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Atyrau and new/pytz-2016.10/pytz/zoneinfo/Asia/Atyrau differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Baku and new/pytz-2016.10/pytz/zoneinfo/Asia/Baku differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Barnaul and new/pytz-2016.10/pytz/zoneinfo/Asia/Barnaul differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Bishkek and new/pytz-2016.10/pytz/zoneinfo/Asia/Bishkek differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Chita and new/pytz-2016.10/pytz/zoneinfo/Asia/Chita differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Colombo and new/pytz-2016.10/pytz/zoneinfo/Asia/Colombo differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Dushanbe and new/pytz-2016.10/pytz/zoneinfo/Asia/Dushanbe differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Famagusta and new/pytz-2016.10/pytz/zoneinfo/Asia/Famagusta differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Gaza and new/pytz-2016.10/pytz/zoneinfo/Asia/Gaza differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Hebron and new/pytz-2016.10/pytz/zoneinfo/Asia/Hebron differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Irkutsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Irkutsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Istanbul and new/pytz-2016.10/pytz/zoneinfo/Asia/Istanbul differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Kamchatka and new/pytz-2016.10/pytz/zoneinfo/Asia/Kamchatka differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Khandyga and new/pytz-2016.10/pytz/zoneinfo/Asia/Khandyga differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Krasnoyarsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Krasnoyarsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Magadan and new/pytz-2016.10/pytz/zoneinfo/Asia/Magadan differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Novokuznetsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Novokuznetsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Novosibirsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Novosibirsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Omsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Omsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Oral and new/pytz-2016.10/pytz/zoneinfo/Asia/Oral differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Qyzylorda and new/pytz-2016.10/pytz/zoneinfo/Asia/Qyzylorda differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Sakhalin and new/pytz-2016.10/pytz/zoneinfo/Asia/Sakhalin differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Samarkand and new/pytz-2016.10/pytz/zoneinfo/Asia/Samarkand differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Srednekolymsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Srednekolymsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Tashkent and new/pytz-2016.10/pytz/zoneinfo/Asia/Tashkent differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Tbilisi and new/pytz-2016.10/pytz/zoneinfo/Asia/Tbilisi differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Tomsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Tomsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Ust-Nera and new/pytz-2016.10/pytz/zoneinfo/Asia/Ust-Nera differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Vladivostok and new/pytz-2016.10/pytz/zoneinfo/Asia/Vladivostok differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Yakutsk and new/pytz-2016.10/pytz/zoneinfo/Asia/Yakutsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Yangon and new/pytz-2016.10/pytz/zoneinfo/Asia/Yangon differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Yekaterinburg and new/pytz-2016.10/pytz/zoneinfo/Asia/Yekaterinburg differ Binary files old/pytz-2016.4/pytz/zoneinfo/Asia/Yerevan and new/pytz-2016.10/pytz/zoneinfo/Asia/Yerevan differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+1 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+1 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+10 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+10 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+11 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+11 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+12 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+12 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+2 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+2 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+3 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+3 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+4 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+4 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+5 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+5 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+6 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+6 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+7 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+7 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+8 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+8 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT+9 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT+9 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-1 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-1 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-10 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-10 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-11 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-11 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-12 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-12 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-13 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-13 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-14 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-14 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-2 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-2 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-3 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-3 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-4 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-4 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-5 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-5 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-6 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-6 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-7 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-7 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-8 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-8 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Etc/GMT-9 and new/pytz-2016.10/pytz/zoneinfo/Etc/GMT-9 differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Astrakhan and new/pytz-2016.10/pytz/zoneinfo/Europe/Astrakhan differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Istanbul and new/pytz-2016.10/pytz/zoneinfo/Europe/Istanbul differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Kaliningrad and new/pytz-2016.10/pytz/zoneinfo/Europe/Kaliningrad differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Kirov and new/pytz-2016.10/pytz/zoneinfo/Europe/Kirov differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Malta and new/pytz-2016.10/pytz/zoneinfo/Europe/Malta differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Minsk and new/pytz-2016.10/pytz/zoneinfo/Europe/Minsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Moscow and new/pytz-2016.10/pytz/zoneinfo/Europe/Moscow differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Rome and new/pytz-2016.10/pytz/zoneinfo/Europe/Rome differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Samara and new/pytz-2016.10/pytz/zoneinfo/Europe/Samara differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/San_Marino and new/pytz-2016.10/pytz/zoneinfo/Europe/San_Marino differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Saratov and new/pytz-2016.10/pytz/zoneinfo/Europe/Saratov differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Ulyanovsk and new/pytz-2016.10/pytz/zoneinfo/Europe/Ulyanovsk differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Vatican and new/pytz-2016.10/pytz/zoneinfo/Europe/Vatican differ Binary files old/pytz-2016.4/pytz/zoneinfo/Europe/Volgograd and new/pytz-2016.10/pytz/zoneinfo/Europe/Volgograd differ Binary files old/pytz-2016.4/pytz/zoneinfo/Factory and new/pytz-2016.10/pytz/zoneinfo/Factory differ Binary files old/pytz-2016.4/pytz/zoneinfo/Indian/Kerguelen and new/pytz-2016.10/pytz/zoneinfo/Indian/Kerguelen differ Binary files old/pytz-2016.4/pytz/zoneinfo/Mexico/BajaNorte and new/pytz-2016.10/pytz/zoneinfo/Mexico/BajaNorte differ Binary files old/pytz-2016.4/pytz/zoneinfo/Pacific/Tongatapu and new/pytz-2016.10/pytz/zoneinfo/Pacific/Tongatapu differ Binary files old/pytz-2016.4/pytz/zoneinfo/Turkey and new/pytz-2016.10/pytz/zoneinfo/Turkey differ Binary files old/pytz-2016.4/pytz/zoneinfo/US/Pacific and new/pytz-2016.10/pytz/zoneinfo/US/Pacific differ Binary files old/pytz-2016.4/pytz/zoneinfo/US/Pacific-New and new/pytz-2016.10/pytz/zoneinfo/US/Pacific-New differ Binary files old/pytz-2016.4/pytz/zoneinfo/W-SU and new/pytz-2016.10/pytz/zoneinfo/W-SU differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/zoneinfo/iso3166.tab new/pytz-2016.10/pytz/zoneinfo/iso3166.tab --- old/pytz-2016.4/pytz/zoneinfo/iso3166.tab 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/zoneinfo/iso3166.tab 2016-12-06 10:55:38.000000000 +0100 @@ -75,7 +75,7 @@ CR Costa Rica CU Cuba CV Cape Verde -CW Curacao +CW Curaçao CX Christmas Island CY Cyprus CZ Czech Republic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/zoneinfo/zone.tab new/pytz-2016.10/pytz/zoneinfo/zone.tab --- old/pytz-2016.4/pytz/zoneinfo/zone.tab 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/zoneinfo/zone.tab 2016-12-06 10:55:38.000000000 +0100 @@ -152,7 +152,8 @@ CV +1455-02331 Atlantic/Cape_Verde CW +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia +CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3507+03357 Asia/Famagusta Northern Cyprus CZ +5005+01426 Europe/Prague DE +5230+01322 Europe/Berlin Germany (most areas) DE +4742+00841 Europe/Busingen Busingen @@ -238,7 +239,8 @@ KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe -KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau +KZ +4431+05016 Asia/Aqtau Mangghystau/Mankistau +KZ +4707+05156 Asia/Atyrau Atyrau/Atirau/Gur'yev KZ +5113+05121 Asia/Oral West Kazakhstan LA +1758+10236 Asia/Vientiane LB +3353+03530 Asia/Beirut @@ -261,7 +263,7 @@ MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako -MM +1647+09610 Asia/Rangoon +MM +1647+09610 Asia/Yangon MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar @@ -329,14 +331,15 @@ RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area RU +4457+03406 Europe/Simferopol MSK+00 - Crimea -RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd, Saratov +RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd RU +5836+04939 Europe/Kirov MSK+00 - Kirov RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan -RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia +RU +5134+04602 Europe/Saratov MSK+01 - Saratov RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk +RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg MSK+02 - Urals RU +5500+07324 Asia/Omsk MSK+03 - Omsk -RU +5502+08255 Asia/Novosibirsk MSK+03 - Novosibirsk +RU +5502+08255 Asia/Novosibirsk MSK+04 - Novosibirsk RU +5322+08345 Asia/Barnaul MSK+04 - Altai RU +5630+08458 Asia/Tomsk MSK+04 - Tomsk RU +5345+08707 Asia/Novokuznetsk MSK+04 - Kemerovo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz/zoneinfo/zone1970.tab new/pytz-2016.10/pytz/zoneinfo/zone1970.tab --- old/pytz-2016.4/pytz/zoneinfo/zone1970.tab 2016-04-22 14:58:11.000000000 +0200 +++ new/pytz-2016.10/pytz/zoneinfo/zone1970.tab 2016-12-06 10:55:38.000000000 +0100 @@ -144,7 +144,8 @@ CV +1455-02331 Atlantic/Cape_Verde CW,AW,BQ,SX +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia +CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3507+03357 Asia/Famagusta Northern Cyprus CZ,SK +5005+01426 Europe/Prague DE +5230+01322 Europe/Berlin Germany (most areas) DK +5540+01235 Europe/Copenhagen @@ -209,8 +210,9 @@ KR +3733+12658 Asia/Seoul KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda -KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe -KZ +4431+05016 Asia/Aqtau Atyrau/Atirau/Gur'yev, Mangghystau/Mankistau +KZ +5017+05710 Asia/Aqtobe Aqtöbe/Aktobe +KZ +4431+05016 Asia/Aqtau Mangghystaū/Mankistau +KZ +4707+05156 Asia/Atyrau Atyraū/Atirau/Gur'yev KZ +5113+05121 Asia/Oral West Kazakhstan LB +3353+03530 Asia/Beirut LK +0656+07951 Asia/Colombo @@ -224,7 +226,7 @@ MD +4700+02850 Europe/Chisinau MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) MH +0905+16720 Pacific/Kwajalein Kwajalein -MM +1647+09610 Asia/Rangoon +MM +1647+09610 Asia/Yangon MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar @@ -286,14 +288,15 @@ RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area RU +4457+03406 Europe/Simferopol MSK+00 - Crimea -RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd, Saratov +RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd RU +5836+04939 Europe/Kirov MSK+00 - Kirov RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan -RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia +RU +5134+04602 Europe/Saratov MSK+01 - Saratov RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk +RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg MSK+02 - Urals RU +5500+07324 Asia/Omsk MSK+03 - Omsk -RU +5502+08255 Asia/Novosibirsk MSK+03 - Novosibirsk +RU +5502+08255 Asia/Novosibirsk MSK+04 - Novosibirsk RU +5322+08345 Asia/Barnaul MSK+04 - Altai RU +5630+08458 Asia/Tomsk MSK+04 - Tomsk RU +5345+08707 Asia/Novokuznetsk MSK+04 - Kemerovo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz.egg-info/PKG-INFO new/pytz-2016.10/pytz.egg-info/PKG-INFO --- old/pytz-2016.4/pytz.egg-info/PKG-INFO 2016-04-22 15:11:10.000000000 +0200 +++ new/pytz-2016.10/pytz.egg-info/PKG-INFO 2016-12-06 11:00:22.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pytz -Version: 2016.4 +Version: 2016.10 Summary: World timezone definitions, modern and historical Home-page: http://pythonhosted.org/pytz Author: Stuart Bishop @@ -549,10 +549,11 @@ database. The latest version can be downloaded from the `Python Package Index <http://pypi.python.org/pypi/pytz/>`_. The code that is used to generate this distribution is hosted on launchpad.net and available - using the `Bazaar version control system <http://bazaar-vcs.org>`_ - using:: + using git:: - bzr branch lp:pytz + git clone https://git.launchpad.net/pytz + + A mirror on github is also available at https://github.com/stub42/pytz Announcements of new releases are made on `Launchpad <https://launchpad.net/pytz>`_, and the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2016.4/pytz.egg-info/SOURCES.txt new/pytz-2016.10/pytz.egg-info/SOURCES.txt --- old/pytz-2016.4/pytz.egg-info/SOURCES.txt 2016-04-22 15:11:10.000000000 +0200 +++ new/pytz-2016.10/pytz.egg-info/SOURCES.txt 2016-12-06 11:00:22.000000000 +0100 @@ -307,6 +307,7 @@ pytz/zoneinfo/Asia/Aqtobe pytz/zoneinfo/Asia/Ashgabat pytz/zoneinfo/Asia/Ashkhabad +pytz/zoneinfo/Asia/Atyrau pytz/zoneinfo/Asia/Baghdad pytz/zoneinfo/Asia/Bahrain pytz/zoneinfo/Asia/Baku @@ -327,6 +328,7 @@ pytz/zoneinfo/Asia/Dili pytz/zoneinfo/Asia/Dubai pytz/zoneinfo/Asia/Dushanbe +pytz/zoneinfo/Asia/Famagusta pytz/zoneinfo/Asia/Gaza pytz/zoneinfo/Asia/Harbin pytz/zoneinfo/Asia/Hebron @@ -392,6 +394,7 @@ pytz/zoneinfo/Asia/Vientiane pytz/zoneinfo/Asia/Vladivostok pytz/zoneinfo/Asia/Yakutsk +pytz/zoneinfo/Asia/Yangon pytz/zoneinfo/Asia/Yekaterinburg pytz/zoneinfo/Asia/Yerevan pytz/zoneinfo/Atlantic/Azores @@ -523,6 +526,7 @@ pytz/zoneinfo/Europe/Samara pytz/zoneinfo/Europe/San_Marino pytz/zoneinfo/Europe/Sarajevo +pytz/zoneinfo/Europe/Saratov pytz/zoneinfo/Europe/Simferopol pytz/zoneinfo/Europe/Skopje pytz/zoneinfo/Europe/Sofia ++++++ system_zoneinfo.patch ++++++ --- /var/tmp/diff_new_pack.tuwnJt/_old 2017-03-21 22:43:27.738411178 +0100 +++ /var/tmp/diff_new_pack.tuwnJt/_new 2017-03-21 22:43:27.738411178 +0100 @@ -1,38 +1,32 @@ -Index: pytz-2014.9/pytz/__init__.py +Index: pytz-2016.10/pytz/__init__.py =================================================================== ---- pytz-2014.9.orig/pytz/__init__.py -+++ pytz-2014.9/pytz/__init__.py -@@ -25,11 +25,6 @@ __all__ = [ - - import sys, datetime, os.path, gettext - --try: -- from pkg_resources import resource_stream --except ImportError: -- resource_stream = None -- - from pytz.exceptions import AmbiguousTimeError - from pytz.exceptions import InvalidTimeError - from pytz.exceptions import NonExistentTimeError -@@ -86,13 +81,7 @@ def open_resource(name): +--- pytz-2016.10.orig/pytz/__init__.py ++++ pytz-2016.10/pytz/__init__.py +@@ -81,19 +81,7 @@ def open_resource(name): for part in name_parts: if part == os.path.pardir or os.path.sep in part: raise ValueError('Bad path segment: %r' % part) - filename = os.path.join(os.path.dirname(__file__), - 'zoneinfo', *name_parts) -- if not os.path.exists(filename) and resource_stream is not None: +- if not os.path.exists(filename): - # http://bugs.launchpad.net/bugs/383171 - we avoid using this - # unless absolutely necessary to help when a broken version of - # pkg_resources is installed. -- return resource_stream(__name__, 'zoneinfo/' + name) +- try: +- from pkg_resources import resource_stream +- except ImportError: +- resource_stream = None +- +- if resource_stream is not None: +- return resource_stream(__name__, 'zoneinfo/' + name) + filename = os.path.join('/usr/share/zoneinfo', *name_parts) return open(filename, 'rb') -Index: pytz-2014.9/pytz/tzfile.py +Index: pytz-2016.10/pytz/tzfile.py =================================================================== ---- pytz-2014.9.orig/pytz/tzfile.py -+++ pytz-2014.9/pytz/tzfile.py +--- pytz-2016.10.orig/pytz/tzfile.py ++++ pytz-2016.10/pytz/tzfile.py @@ -127,7 +127,7 @@ def build_tzinfo(zone, fp): if __name__ == '__main__': import os.path