Hello community, here is the log from the commit of package python-pytz for openSUSE:Factory checked in at 2014-11-15 11:40:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pytz (Old) and /work/SRC/openSUSE:Factory/.python-pytz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytz" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pytz/python-pytz.changes 2014-08-13 17:08:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pytz.new/python-pytz.changes 2014-11-15 12:26:11.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Nov 13 12:17:35 UTC 2014 - [email protected] + +- Use system tz database instead pytz one + + Add system_zoneinfo.patch + + Add timezone requirement + +------------------------------------------------------------------- +Tue Nov 11 11:47:38 UTC 2014 - [email protected] + +- Update to pytz 2014.9 + + Database updated to 2014i + +------------------------------------------------------------------- Old: ---- pytz-2014.4.tar.bz2 New: ---- pytz-2014.9.tar.bz2 system_zoneinfo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pytz.spec ++++++ --- /var/tmp/diff_new_pack.zOgJkq/_old 2014-11-15 12:26:12.000000000 +0100 +++ /var/tmp/diff_new_pack.zOgJkq/_new 2014-11-15 12:26:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: python-pytz -Version: 2014.4 +Version: 2014.9 Release: 0 Summary: World timezone definitions, modern and historical License: MIT @@ -26,9 +26,14 @@ Source: http://pypi.python.org/packages/source/p/pytz/pytz-%{version}.tar.bz2 # 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 BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-nose +# Tests will use this package +BuildRequires: timezone 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()")} @@ -53,6 +58,8 @@ %setup -q -n pytz-%{version} # Disable test which is not working (and documented so) %patch0 -p1 +# Use system tz database +%patch1 -p1 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./pytz/tzfile.py @@ -61,6 +68,8 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# Remove the pytz zoneinfo +rm -fr %{buildroot}%{python_sitelib}/pytz/zoneinfo %fdupes %{buildroot}%{python_sitelib} %check ++++++ pytz-2014.4.tar.bz2 -> pytz-2014.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/PKG-INFO new/pytz-2014.9/PKG-INFO --- old/pytz-2014.4/PKG-INFO 2014-06-02 14:47:30.000000000 +0200 +++ new/pytz-2014.9/PKG-INFO 2014-11-03 11:45:31.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pytz -Version: 2014.4 +Version: 2014.9 Summary: World timezone definitions, modern and historical Home-page: http://pythonhosted.org/pytz Author: Stuart Bishop @@ -152,7 +152,7 @@ >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) - '2006-03-27 08:34:59 EST+1100' + '2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = utc.normalize(au_dt.astimezone(utc)) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -168,7 +168,7 @@ >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) - '2006-03-27 08:34:59 EST+1100' + '2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = au_dt.astimezone(utc) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -351,30 +351,36 @@ >>> isinstance(pytz.NonExistentTimeError(), pytz.InvalidTimeError) True - Although ``localize()`` handles many cases, it is still not possible - to handle all. In cases where countries change their timezone definitions, - cases like the end-of-daylight-saving-time occur with no way of resolving - the ambiguity. For example, in 1915 Warsaw switched from Warsaw time to - Central European time. So at the stroke of midnight on August 5th 1915 - the clocks were wound back 24 minutes creating an ambiguous time period - that cannot be specified without referring to the timezone abbreviation - or the actual UTC offset. In this case midnight happened twice, neither - time during a daylight saving time period: + + A special case is where countries change their timezone definitions + with no daylight savings time switch. For example, in 1915 Warsaw + switched from Warsaw time to Central European time with no daylight savings + transition. So at the stroke of midnight on August 5th 1915 the clocks + were wound back 24 minutes creating an ambiguous time period that cannot + be specified without referring to the timezone abbreviation or the + actual UTC offset. In this case midnight happened twice, neither time + during a daylight saving time period. pytz handles this transition by + treating the ambiguous period before the switch as daylight savings + time, and the ambiguous period after as standard time. + >>> warsaw = pytz.timezone('Europe/Warsaw') - >>> loc_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False) - >>> loc_dt1.strftime(fmt) + >>> amb_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=True) + >>> amb_dt1.strftime(fmt) '1915-08-04 23:59:59 WMT+0124' - >>> loc_dt2 = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False) - >>> loc_dt2.strftime(fmt) + >>> amb_dt2 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False) + >>> amb_dt2.strftime(fmt) + '1915-08-04 23:59:59 CET+0100' + >>> switch_dt = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False) + >>> switch_dt.strftime(fmt) '1915-08-05 00:00:00 CET+0100' - >>> str(loc_dt2 - loc_dt1) + >>> str(switch_dt - amb_dt1) '0:24:01' + >>> str(switch_dt - amb_dt2) + '0:00:01' - The only way of creating a time during the missing 24 minutes is - converting from another timezone - because neither of the timezones - involved where in daylight saving mode the API simply provides no way - to express it: + The best way of creating a time during an ambiguous time period is + by converting from another timezone such as UTC: >>> utc_dt = datetime(1915, 8, 4, 22, 36, tzinfo=pytz.utc) >>> utc_dt.astimezone(warsaw).strftime(fmt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/README.txt new/pytz-2014.9/README.txt --- old/pytz-2014.4/README.txt 2014-06-02 14:40:54.000000000 +0200 +++ new/pytz-2014.9/README.txt 2014-11-03 11:44:43.000000000 +0100 @@ -143,7 +143,7 @@ >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) -'2006-03-27 08:34:59 EST+1100' +'2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = utc.normalize(au_dt.astimezone(utc)) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -159,7 +159,7 @@ >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) -'2006-03-27 08:34:59 EST+1100' +'2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = au_dt.astimezone(utc) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -342,30 +342,36 @@ >>> isinstance(pytz.NonExistentTimeError(), pytz.InvalidTimeError) True -Although ``localize()`` handles many cases, it is still not possible -to handle all. In cases where countries change their timezone definitions, -cases like the end-of-daylight-saving-time occur with no way of resolving -the ambiguity. For example, in 1915 Warsaw switched from Warsaw time to -Central European time. So at the stroke of midnight on August 5th 1915 -the clocks were wound back 24 minutes creating an ambiguous time period -that cannot be specified without referring to the timezone abbreviation -or the actual UTC offset. In this case midnight happened twice, neither -time during a daylight saving time period: + +A special case is where countries change their timezone definitions +with no daylight savings time switch. For example, in 1915 Warsaw +switched from Warsaw time to Central European time with no daylight savings +transition. So at the stroke of midnight on August 5th 1915 the clocks +were wound back 24 minutes creating an ambiguous time period that cannot +be specified without referring to the timezone abbreviation or the +actual UTC offset. In this case midnight happened twice, neither time +during a daylight saving time period. pytz handles this transition by +treating the ambiguous period before the switch as daylight savings +time, and the ambiguous period after as standard time. + >>> warsaw = pytz.timezone('Europe/Warsaw') ->>> loc_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False) ->>> loc_dt1.strftime(fmt) +>>> amb_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=True) +>>> amb_dt1.strftime(fmt) '1915-08-04 23:59:59 WMT+0124' ->>> loc_dt2 = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False) ->>> loc_dt2.strftime(fmt) +>>> amb_dt2 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False) +>>> amb_dt2.strftime(fmt) +'1915-08-04 23:59:59 CET+0100' +>>> switch_dt = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False) +>>> switch_dt.strftime(fmt) '1915-08-05 00:00:00 CET+0100' ->>> str(loc_dt2 - loc_dt1) +>>> str(switch_dt - amb_dt1) '0:24:01' +>>> str(switch_dt - amb_dt2) +'0:00:01' -The only way of creating a time during the missing 24 minutes is -converting from another timezone - because neither of the timezones -involved where in daylight saving mode the API simply provides no way -to express it: +The best way of creating a time during an ambiguous time period is +by converting from another timezone such as UTC: >>> utc_dt = datetime(1915, 8, 4, 22, 36, tzinfo=pytz.utc) >>> utc_dt.astimezone(warsaw).strftime(fmt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz/__init__.py new/pytz-2014.9/pytz/__init__.py --- old/pytz-2014.4/pytz/__init__.py 2014-06-02 14:40:54.000000000 +0200 +++ new/pytz-2014.9/pytz/__init__.py 2014-11-03 11:44:43.000000000 +0100 @@ -9,8 +9,8 @@ ''' # The Olson database is updated several times a year. -OLSON_VERSION = '2014d' -VERSION = '2014.4' # Switching to pip compatible version numbering. +OLSON_VERSION = '2014i' +VERSION = '2014.9' # Switching to pip compatible version numbering. __version__ = VERSION OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling @@ -735,6 +735,7 @@ 'Asia/Bishkek', 'Asia/Brunei', 'Asia/Calcutta', + 'Asia/Chita', 'Asia/Choibalsan', 'Asia/Chongqing', 'Asia/Chungking', @@ -792,6 +793,7 @@ 'Asia/Seoul', 'Asia/Shanghai', 'Asia/Singapore', + 'Asia/Srednekolymsk', 'Asia/Taipei', 'Asia/Tashkent', 'Asia/Tbilisi', @@ -1002,6 +1004,7 @@ 'PST8PDT', 'Pacific/Apia', 'Pacific/Auckland', + 'Pacific/Bougainville', 'Pacific/Chatham', 'Pacific/Chuuk', 'Pacific/Easter', @@ -1297,8 +1300,8 @@ 'Asia/Beirut', 'Asia/Bishkek', 'Asia/Brunei', + 'Asia/Chita', 'Asia/Choibalsan', - 'Asia/Chongqing', 'Asia/Colombo', 'Asia/Damascus', 'Asia/Dhaka', @@ -1306,7 +1309,6 @@ 'Asia/Dubai', 'Asia/Dushanbe', 'Asia/Gaza', - 'Asia/Harbin', 'Asia/Hebron', 'Asia/Ho_Chi_Minh', 'Asia/Hong_Kong', @@ -1318,7 +1320,6 @@ 'Asia/Kabul', 'Asia/Kamchatka', 'Asia/Karachi', - 'Asia/Kashgar', 'Asia/Kathmandu', 'Asia/Khandyga', 'Asia/Kolkata', @@ -1348,6 +1349,7 @@ 'Asia/Seoul', 'Asia/Shanghai', 'Asia/Singapore', + 'Asia/Srednekolymsk', 'Asia/Taipei', 'Asia/Tashkent', 'Asia/Tbilisi', @@ -1460,6 +1462,7 @@ 'Indian/Reunion', 'Pacific/Apia', 'Pacific/Auckland', + 'Pacific/Bougainville', 'Pacific/Chatham', 'Pacific/Chuuk', 'Pacific/Easter', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz/tests/test_tzinfo.py new/pytz-2014.9/pytz/tests/test_tzinfo.py --- old/pytz-2014.4/pytz/tests/test_tzinfo.py 2014-06-02 14:40:54.000000000 +0200 +++ new/pytz-2014.9/pytz/tests/test_tzinfo.py 2014-11-03 11:44:43.000000000 +0100 @@ -21,8 +21,8 @@ # I test for expected version to ensure the correct version of pytz is # actually being tested. -EXPECTED_VERSION='2014.4' -EXPECTED_OLSON_VERSION='2014d' +EXPECTED_VERSION='2014.9' +EXPECTED_OLSON_VERSION='2014i' fmt = '%Y-%m-%d %H:%M:%S %Z%z' @@ -547,7 +547,7 @@ tzinfo = pytz.timezone('Pacific/Apia') transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC) before = { - 'tzname': 'WSDT', + 'tzname': 'SDT', 'utcoffset': timedelta(hours=-10), 'dst': timedelta(hours=1), } @@ -659,6 +659,23 @@ loc_time = loc_tz.localize(datetime(1945, 9, 30, 1, 0, 0), is_dst=0) self.assertEqual(loc_time.strftime('%Z%z'), 'EST-0500') + # Weird changes - ambiguous time (end-of-DST like) but is_dst==False + for zonename, ambiguous_naive, expected in [ + ('Europe/Warsaw', datetime(1915, 8, 4, 23, 59, 59), + ['1915-08-04 23:59:59 WMT+0124', + '1915-08-04 23:59:59 CET+0100']), + ('Europe/Moscow', datetime(2014, 10, 26, 1, 30), + ['2014-10-26 01:30:00 MSK+0400', + '2014-10-26 01:30:00 MSK+0300'])]: + loc_tz = pytz.timezone(zonename) + self.assertRaises(pytz.AmbiguousTimeError, + loc_tz.localize, ambiguous_naive, is_dst=None + ) + # Also test non-boolean is_dst in the weird case + for dst in [True, timedelta(1), False, timedelta(0)]: + loc_time = loc_tz.localize(ambiguous_naive, is_dst=dst) + self.assertEqual(loc_time.strftime(fmt), expected[not dst]) + def testNormalize(self): tz = pytz.timezone('US/Eastern') dt = datetime(2004, 4, 4, 7, 0, 0, tzinfo=UTC).astimezone(tz) @@ -677,7 +694,7 @@ def testPartialMinuteOffsets(self): # utcoffset in Amsterdam was not a whole minute until 1937 # However, we fudge this by rounding them, as the Python - # datetime library + # datetime library tz = pytz.timezone('Europe/Amsterdam') utc_dt = datetime(1914, 1, 1, 13, 40, 28, tzinfo=UTC) # correct utc_dt = utc_dt.replace(second=0) # But we need to fudge it @@ -817,4 +834,3 @@ if __name__ == '__main__': warnings.simplefilter("error") # Warnings should be fatal in tests. unittest.main(defaultTest='test_suite') - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz/tzinfo.py new/pytz-2014.9/pytz/tzinfo.py --- old/pytz-2014.4/pytz/tzinfo.py 2014-06-02 14:40:54.000000000 +0200 +++ new/pytz-2014.9/pytz/tzinfo.py 2014-11-03 11:44:43.000000000 +0100 @@ -142,7 +142,7 @@ def __reduce__(self): # Special pickle to zone remains a singleton and to cope with - # database changes. + # database changes. return pytz._p, (self.zone,) @@ -369,13 +369,15 @@ # hints to be passed in (such as the UTC offset or abbreviation), # but that is just getting silly. # - # Choose the earliest (by UTC) applicable timezone. - sorting_keys = {} + # Choose the earliest (by UTC) applicable timezone if is_dst=True + # Choose the latest (by UTC) applicable timezone if is_dst=False + # i.e., behave like end-of-DST transition + dates = {} # utc -> local for local_dt in filtered_possible_loc_dt: - key = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset - sorting_keys[key] = local_dt - first_key = sorted(sorting_keys)[0] - return sorting_keys[first_key] + utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset + assert utc_time not in dates + dates[utc_time] = local_dt + return dates[[min, max][not is_dst](dates)] def utcoffset(self, dt, is_dst=None): '''See datetime.tzinfo.utcoffset @@ -560,4 +562,3 @@ inf = (utcoffset, dstoffset, tzname) tz._tzinfos[inf] = tz.__class__(inf, tz._tzinfos) return tz._tzinfos[inf] - Files old/pytz-2014.4/pytz/zoneinfo/Africa/Accra and new/pytz-2014.9/pytz/zoneinfo/Africa/Accra differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Bamako and new/pytz-2014.9/pytz/zoneinfo/Africa/Bamako differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Bangui and new/pytz-2014.9/pytz/zoneinfo/Africa/Bangui differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Banjul and new/pytz-2014.9/pytz/zoneinfo/Africa/Banjul differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Bissau and new/pytz-2014.9/pytz/zoneinfo/Africa/Bissau differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Blantyre and new/pytz-2014.9/pytz/zoneinfo/Africa/Blantyre differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Brazzaville and new/pytz-2014.9/pytz/zoneinfo/Africa/Brazzaville differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Bujumbura and new/pytz-2014.9/pytz/zoneinfo/Africa/Bujumbura differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Cairo and new/pytz-2014.9/pytz/zoneinfo/Africa/Cairo differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Casablanca and new/pytz-2014.9/pytz/zoneinfo/Africa/Casablanca differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Conakry and new/pytz-2014.9/pytz/zoneinfo/Africa/Conakry differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Dakar and new/pytz-2014.9/pytz/zoneinfo/Africa/Dakar differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Douala and new/pytz-2014.9/pytz/zoneinfo/Africa/Douala differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/El_Aaiun and new/pytz-2014.9/pytz/zoneinfo/Africa/El_Aaiun differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Freetown and new/pytz-2014.9/pytz/zoneinfo/Africa/Freetown differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Gaborone and new/pytz-2014.9/pytz/zoneinfo/Africa/Gaborone differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Harare and new/pytz-2014.9/pytz/zoneinfo/Africa/Harare differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Kigali and new/pytz-2014.9/pytz/zoneinfo/Africa/Kigali differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Kinshasa and new/pytz-2014.9/pytz/zoneinfo/Africa/Kinshasa differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Libreville and new/pytz-2014.9/pytz/zoneinfo/Africa/Libreville differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Lome and new/pytz-2014.9/pytz/zoneinfo/Africa/Lome differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Luanda and new/pytz-2014.9/pytz/zoneinfo/Africa/Luanda differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Lubumbashi and new/pytz-2014.9/pytz/zoneinfo/Africa/Lubumbashi differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Lusaka and new/pytz-2014.9/pytz/zoneinfo/Africa/Lusaka differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Malabo and new/pytz-2014.9/pytz/zoneinfo/Africa/Malabo differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Maseru and new/pytz-2014.9/pytz/zoneinfo/Africa/Maseru differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Mbabane and new/pytz-2014.9/pytz/zoneinfo/Africa/Mbabane differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Niamey and new/pytz-2014.9/pytz/zoneinfo/Africa/Niamey differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Nouakchott and new/pytz-2014.9/pytz/zoneinfo/Africa/Nouakchott differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Ouagadougou and new/pytz-2014.9/pytz/zoneinfo/Africa/Ouagadougou differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Porto-Novo and new/pytz-2014.9/pytz/zoneinfo/Africa/Porto-Novo differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Sao_Tome and new/pytz-2014.9/pytz/zoneinfo/Africa/Sao_Tome differ Files old/pytz-2014.4/pytz/zoneinfo/Africa/Timbuktu and new/pytz-2014.9/pytz/zoneinfo/Africa/Timbuktu differ Files old/pytz-2014.4/pytz/zoneinfo/America/Grand_Turk and new/pytz-2014.9/pytz/zoneinfo/America/Grand_Turk differ Files old/pytz-2014.4/pytz/zoneinfo/America/Jamaica and new/pytz-2014.9/pytz/zoneinfo/America/Jamaica differ Files old/pytz-2014.4/pytz/zoneinfo/America/Metlakatla and new/pytz-2014.9/pytz/zoneinfo/America/Metlakatla differ Files old/pytz-2014.4/pytz/zoneinfo/Antarctica/Casey and new/pytz-2014.9/pytz/zoneinfo/Antarctica/Casey differ Files old/pytz-2014.4/pytz/zoneinfo/Antarctica/Macquarie and new/pytz-2014.9/pytz/zoneinfo/Antarctica/Macquarie differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Chita and new/pytz-2014.9/pytz/zoneinfo/Asia/Chita differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Chongqing and new/pytz-2014.9/pytz/zoneinfo/Asia/Chongqing differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Chungking and new/pytz-2014.9/pytz/zoneinfo/Asia/Chungking differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Dacca and new/pytz-2014.9/pytz/zoneinfo/Asia/Dacca differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Dhaka and new/pytz-2014.9/pytz/zoneinfo/Asia/Dhaka differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Harbin and new/pytz-2014.9/pytz/zoneinfo/Asia/Harbin differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Ho_Chi_Minh and new/pytz-2014.9/pytz/zoneinfo/Asia/Ho_Chi_Minh differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Irkutsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Irkutsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Jayapura and new/pytz-2014.9/pytz/zoneinfo/Asia/Jayapura differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Kashgar and new/pytz-2014.9/pytz/zoneinfo/Asia/Kashgar differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Khandyga and new/pytz-2014.9/pytz/zoneinfo/Asia/Khandyga differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Krasnoyarsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Krasnoyarsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Magadan and new/pytz-2014.9/pytz/zoneinfo/Asia/Magadan differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Novokuznetsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Novokuznetsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Novosibirsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Novosibirsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Omsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Omsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Phnom_Penh and new/pytz-2014.9/pytz/zoneinfo/Asia/Phnom_Penh differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Pyongyang and new/pytz-2014.9/pytz/zoneinfo/Asia/Pyongyang differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Riyadh and new/pytz-2014.9/pytz/zoneinfo/Asia/Riyadh differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Saigon and new/pytz-2014.9/pytz/zoneinfo/Asia/Saigon differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Sakhalin and new/pytz-2014.9/pytz/zoneinfo/Asia/Sakhalin differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Samarkand and new/pytz-2014.9/pytz/zoneinfo/Asia/Samarkand differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Seoul and new/pytz-2014.9/pytz/zoneinfo/Asia/Seoul differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Shanghai and new/pytz-2014.9/pytz/zoneinfo/Asia/Shanghai differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Srednekolymsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Srednekolymsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Taipei and new/pytz-2014.9/pytz/zoneinfo/Asia/Taipei differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Tashkent and new/pytz-2014.9/pytz/zoneinfo/Asia/Tashkent differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Tbilisi and new/pytz-2014.9/pytz/zoneinfo/Asia/Tbilisi differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Tokyo and new/pytz-2014.9/pytz/zoneinfo/Asia/Tokyo differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Urumqi and new/pytz-2014.9/pytz/zoneinfo/Asia/Urumqi differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Ust-Nera and new/pytz-2014.9/pytz/zoneinfo/Asia/Ust-Nera differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Vientiane and new/pytz-2014.9/pytz/zoneinfo/Asia/Vientiane differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Vladivostok and new/pytz-2014.9/pytz/zoneinfo/Asia/Vladivostok differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Yakutsk and new/pytz-2014.9/pytz/zoneinfo/Asia/Yakutsk differ Files old/pytz-2014.4/pytz/zoneinfo/Asia/Yekaterinburg and new/pytz-2014.9/pytz/zoneinfo/Asia/Yekaterinburg differ Files old/pytz-2014.4/pytz/zoneinfo/Atlantic/Azores and new/pytz-2014.9/pytz/zoneinfo/Atlantic/Azores differ Files old/pytz-2014.4/pytz/zoneinfo/Atlantic/Madeira and new/pytz-2014.9/pytz/zoneinfo/Atlantic/Madeira differ Files old/pytz-2014.4/pytz/zoneinfo/Atlantic/St_Helena and new/pytz-2014.9/pytz/zoneinfo/Atlantic/St_Helena differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/ACT and new/pytz-2014.9/pytz/zoneinfo/Australia/ACT differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Adelaide and new/pytz-2014.9/pytz/zoneinfo/Australia/Adelaide differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Brisbane and new/pytz-2014.9/pytz/zoneinfo/Australia/Brisbane differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Broken_Hill and new/pytz-2014.9/pytz/zoneinfo/Australia/Broken_Hill differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Canberra and new/pytz-2014.9/pytz/zoneinfo/Australia/Canberra differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Currie and new/pytz-2014.9/pytz/zoneinfo/Australia/Currie differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Darwin and new/pytz-2014.9/pytz/zoneinfo/Australia/Darwin differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Eucla and new/pytz-2014.9/pytz/zoneinfo/Australia/Eucla differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Hobart and new/pytz-2014.9/pytz/zoneinfo/Australia/Hobart differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/LHI and new/pytz-2014.9/pytz/zoneinfo/Australia/LHI differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Lindeman and new/pytz-2014.9/pytz/zoneinfo/Australia/Lindeman differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Lord_Howe and new/pytz-2014.9/pytz/zoneinfo/Australia/Lord_Howe differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Melbourne and new/pytz-2014.9/pytz/zoneinfo/Australia/Melbourne differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/NSW and new/pytz-2014.9/pytz/zoneinfo/Australia/NSW differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/North and new/pytz-2014.9/pytz/zoneinfo/Australia/North differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Perth and new/pytz-2014.9/pytz/zoneinfo/Australia/Perth differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Queensland and new/pytz-2014.9/pytz/zoneinfo/Australia/Queensland differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/South and new/pytz-2014.9/pytz/zoneinfo/Australia/South differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Sydney and new/pytz-2014.9/pytz/zoneinfo/Australia/Sydney differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Tasmania and new/pytz-2014.9/pytz/zoneinfo/Australia/Tasmania differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Victoria and new/pytz-2014.9/pytz/zoneinfo/Australia/Victoria differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/West and new/pytz-2014.9/pytz/zoneinfo/Australia/West differ Files old/pytz-2014.4/pytz/zoneinfo/Australia/Yancowinna and new/pytz-2014.9/pytz/zoneinfo/Australia/Yancowinna differ Files old/pytz-2014.4/pytz/zoneinfo/Egypt and new/pytz-2014.9/pytz/zoneinfo/Egypt differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Budapest and new/pytz-2014.9/pytz/zoneinfo/Europe/Budapest differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Helsinki and new/pytz-2014.9/pytz/zoneinfo/Europe/Helsinki differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Kaliningrad and new/pytz-2014.9/pytz/zoneinfo/Europe/Kaliningrad differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Lisbon and new/pytz-2014.9/pytz/zoneinfo/Europe/Lisbon differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Mariehamn and new/pytz-2014.9/pytz/zoneinfo/Europe/Mariehamn differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Minsk and new/pytz-2014.9/pytz/zoneinfo/Europe/Minsk differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Moscow and new/pytz-2014.9/pytz/zoneinfo/Europe/Moscow differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Riga and new/pytz-2014.9/pytz/zoneinfo/Europe/Riga differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Samara and new/pytz-2014.9/pytz/zoneinfo/Europe/Samara differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Simferopol and new/pytz-2014.9/pytz/zoneinfo/Europe/Simferopol differ Files old/pytz-2014.4/pytz/zoneinfo/Europe/Volgograd and new/pytz-2014.9/pytz/zoneinfo/Europe/Volgograd differ Files old/pytz-2014.4/pytz/zoneinfo/Jamaica and new/pytz-2014.9/pytz/zoneinfo/Jamaica differ Files old/pytz-2014.4/pytz/zoneinfo/Japan and new/pytz-2014.9/pytz/zoneinfo/Japan differ Files old/pytz-2014.4/pytz/zoneinfo/NZ-CHAT and new/pytz-2014.9/pytz/zoneinfo/NZ-CHAT differ Files old/pytz-2014.4/pytz/zoneinfo/PRC and new/pytz-2014.9/pytz/zoneinfo/PRC differ Files old/pytz-2014.4/pytz/zoneinfo/Pacific/Apia and new/pytz-2014.9/pytz/zoneinfo/Pacific/Apia differ Files old/pytz-2014.4/pytz/zoneinfo/Pacific/Bougainville and new/pytz-2014.9/pytz/zoneinfo/Pacific/Bougainville differ Files old/pytz-2014.4/pytz/zoneinfo/Pacific/Chatham and new/pytz-2014.9/pytz/zoneinfo/Pacific/Chatham differ Files old/pytz-2014.4/pytz/zoneinfo/Pacific/Fiji and new/pytz-2014.9/pytz/zoneinfo/Pacific/Fiji differ Files old/pytz-2014.4/pytz/zoneinfo/Pacific/Pago_Pago and new/pytz-2014.9/pytz/zoneinfo/Pacific/Pago_Pago differ Files old/pytz-2014.4/pytz/zoneinfo/Pacific/Samoa and new/pytz-2014.9/pytz/zoneinfo/Pacific/Samoa differ Files old/pytz-2014.4/pytz/zoneinfo/Portugal and new/pytz-2014.9/pytz/zoneinfo/Portugal differ Files old/pytz-2014.4/pytz/zoneinfo/ROC and new/pytz-2014.9/pytz/zoneinfo/ROC differ Files old/pytz-2014.4/pytz/zoneinfo/ROK and new/pytz-2014.9/pytz/zoneinfo/ROK differ Files old/pytz-2014.4/pytz/zoneinfo/US/Samoa and new/pytz-2014.9/pytz/zoneinfo/US/Samoa differ Files old/pytz-2014.4/pytz/zoneinfo/W-SU and new/pytz-2014.9/pytz/zoneinfo/W-SU differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz/zoneinfo/iso3166.tab new/pytz-2014.9/pytz/zoneinfo/iso3166.tab --- old/pytz-2014.4/pytz/zoneinfo/iso3166.tab 2014-06-02 14:40:53.000000000 +0200 +++ new/pytz-2014.9/pytz/zoneinfo/iso3166.tab 2014-11-03 11:44:42.000000000 +0100 @@ -3,21 +3,21 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2013-05-27): +# From Paul Eggert (2014-07-18): +# This file contains a table of two-letter country codes. Columns are +# separated by a single tab. Lines beginning with '#' are comments. +# Although all text currently uses ASCII encoding, this is planned to +# change to UTF-8 soon. The columns of the table are as follows: # -# This file contains a table with the following columns: # 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 +# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166 # http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm # 2. The usual English name for the coded region, # chosen so that alphabetic sorting of subsets produces helpful lists. # This is not the same as the English name in the ISO 3166 tables. # -# Columns are separated by a single tab. # The table is sorted by country code. # -# Lines beginning with `#' are comments. -# # This table is intended as an aid for users, to help them select time # zone data appropriate for their practical needs. It is not intended # to take or endorse any position on legal or territorial claims. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz/zoneinfo/zone.tab new/pytz-2014.9/pytz/zoneinfo/zone.tab --- old/pytz-2014.4/pytz/zoneinfo/zone.tab 2014-06-02 14:40:53.000000000 +0200 +++ new/pytz-2014.9/pytz/zoneinfo/zone.tab 2014-11-03 11:44:42.000000000 +0100 @@ -1,36 +1,24 @@ -# TZ zone descriptions +# tz zone descriptions (deprecated version) # # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2013-08-14): +# From Paul Eggert (2014-07-31): +# This file is intended as a backward-compatibility aid for older programs. +# New programs should use zone1970.tab. This file is like zone1970.tab (see +# zone1970.tab's comments), but with the following additional restrictions: # -# This file contains a table where each row stands for an area that is -# the intersection of a region identified by a country code and of a -# zone where civil clocks have agreed since 1970. The columns of the -# table are as follows: +# 1. This file contains only ASCII characters. +# 2. The first data column contains exactly one country code. # -# 1. ISO 3166 2-character country code. See the file 'iso3166.tab'. -# 2. Latitude and longitude of the area's principal location -# in ISO 6709 sign-degrees-minutes-seconds format, -# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, -# first latitude (+ is north), then longitude (+ is east). -# 3. Zone name used in value of TZ environment variable. -# Please see the 'Theory' file for how zone names are chosen. -# If multiple zones overlap a country, each has a row in the -# table, with column 1 being duplicated. -# 4. Comments; present if and only if the country has multiple rows. -# -# Columns are separated by a single tab. -# The table is sorted first by country, then an order within the country that -# (1) makes some geographical sense, and -# (2) puts the most populous areas first, where that does not contradict (1). -# -# Lines beginning with '#' are comments. +# Because of (2), each row stands for an area that is the intersection +# of a region identified by a country code and of a zone where civil +# clocks have agreed since 1970; this is a narrower definition than +# that of zone1970.tab. # # This table is intended as an aid for users, to help them select time -# zone data appropriate for their practical needs. It is not intended -# to take or endorse any position on legal or territorial claims. +# zone data entries appropriate for their practical needs. It is not +# intended to take or endorse any position on legal or territorial claims. # #country- #code coordinates TZ comments @@ -49,7 +37,7 @@ AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok -AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie +AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adelie Land AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) @@ -128,7 +116,7 @@ CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut -CA +744144-0944945 America/Resolute Central Standard Time - Resolute, Nunavut +CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario @@ -153,13 +141,10 @@ CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations -CL -2709-10926 Pacific/Easter Easter Island & Sala y Gomez +CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin -CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc. -CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang -CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang +CN +3114+12128 Asia/Shanghai Beijing Time +CN +4348+08735 Asia/Urumqi Xinjiang Time CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica CU +2308-08222 America/Havana @@ -322,7 +307,8 @@ PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby +PG -0930+14710 Pacific/Port_Moresby most locations +PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi PL +5215+02100 Europe/Warsaw @@ -341,24 +327,26 @@ RO +4426+02606 Europe/Bucharest RS +4450+02030 Europe/Belgrade RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad -RU +5545+03735 Europe/Moscow Moscow+00 - west Russia -RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea -RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia +RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea +RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea +RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk -RU +5345+08707 Asia/Novokuznetsk Moscow+03 - Novokuznetsk +RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal +RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky -RU +5934+15048 Asia/Magadan Moscow+08 - Magadan -RU +5301+15839 Asia/Kamchatka Moscow+08 - Kamchatka -RU +6445+17729 Asia/Anadyr Moscow+08 - Bering Sea +RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan +RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is +RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka +RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea RW -0157+03004 Africa/Kigali SA +2438+04643 Asia/Riyadh SB -0932+16012 Pacific/Guadalcanal @@ -425,13 +413,13 @@ US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) US +340308-1181434 America/Los_Angeles Pacific Time +US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska US +611305-1495401 America/Anchorage Alaska Time US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck US +643004-1652423 America/Nome Alaska Time - west Alaska US +515248-1763929 America/Adak Aleutian Islands -US +550737-1313435 America/Metlakatla Metlakatla Time - Annette Island US +211825-1575130 Pacific/Honolulu Hawaii UY -3453-05611 America/Montevideo UZ +3940+06648 Asia/Samarkand west Uzbekistan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz/zoneinfo/zone1970.tab new/pytz-2014.9/pytz/zoneinfo/zone1970.tab --- old/pytz-2014.4/pytz/zoneinfo/zone1970.tab 1970-01-01 01:00:00.000000000 +0100 +++ new/pytz-2014.9/pytz/zoneinfo/zone1970.tab 2014-11-03 11:44:42.000000000 +0100 @@ -0,0 +1,371 @@ +# tz zone descriptions +# +# This file is in the public domain. +# +# From Paul Eggert (2014-07-31): +# This file contains a table where each row stands for a zone where +# civil time stamps have agreed since 1970. Columns are separated by +# a single tab. Lines beginning with '#' are comments. All text uses +# UTF-8 encoding. The columns of the table are as follows: +# +# 1. The countries that overlap the zone, as a comma-separated list +# of ISO 3166 2-character country codes. See the file 'iso3166.tab'. +# 2. Latitude and longitude of the zone's principal location +# in ISO 6709 sign-degrees-minutes-seconds format, +# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, +# first latitude (+ is north), then longitude (+ is east). +# 3. Zone name used in value of TZ environment variable. +# Please see the 'Theory' file for how zone names are chosen. +# If multiple zones overlap a country, each has a row in the +# table, with each column 1 containing the country code. +# 4. Comments; present if and only if a country has multiple zones. +# +# If a zone covers multiple countries, the most-populous city is used, +# and that country is listed first in column 1; any other countries +# are listed alphabetically by country code. The table is sorted +# first by country code, then (if possible) by an order within the +# country that (1) makes some geographical sense, and (2) puts the +# most populous zones first, where that does not contradict (1). +# +# This table is intended as an aid for users, to help them select time +# zone data entries appropriate for their practical needs. It is not +# intended to take or endorse any position on legal or territorial claims. +# +#country- +#codes coordinates TZ comments +AD +4230+00131 Europe/Andorra +AE,OM +2518+05518 Asia/Dubai +AF +3431+06912 Asia/Kabul +AL +4120+01950 Europe/Tirane +AM +4011+04430 Asia/Yerevan +AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island +AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island +AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay +AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills +AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula +AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok +AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Adélie Land +AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land +AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) +AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) +AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) +AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) +AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) +AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH) +AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR) +AR -3132-06831 America/Argentina/San_Juan San Juan (SJ) +AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) +AR -3319-06621 America/Argentina/San_Luis San Luis (SL) +AR -5138-06913 America/Argentina/Rio_Gallegos Santa Cruz (SC) +AR -5448-06818 America/Argentina/Ushuaia Tierra del Fuego (TF) +AS,UM -1416-17042 Pacific/Pago_Pago Samoa, Midway +AT +4813+01620 Europe/Vienna +AU -3133+15905 Australia/Lord_Howe Lord Howe Island +AU -5430+15857 Antarctica/Macquarie Macquarie Island +AU -4253+14719 Australia/Hobart Tasmania - most locations +AU -3956+14352 Australia/Currie Tasmania - King Island +AU -3749+14458 Australia/Melbourne Victoria +AU -3352+15113 Australia/Sydney New South Wales - most locations +AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna +AU -2728+15302 Australia/Brisbane Queensland - most locations +AU -2016+14900 Australia/Lindeman Queensland - Holiday Islands +AU -3455+13835 Australia/Adelaide South Australia +AU -1228+13050 Australia/Darwin Northern Territory +AU -3157+11551 Australia/Perth Western Australia - most locations +AU -3143+12852 Australia/Eucla Western Australia - Eucla area +AZ +4023+04951 Asia/Baku +BB +1306-05937 America/Barbados +BD +2343+09025 Asia/Dhaka +BE +5050+00420 Europe/Brussels +BG +4241+02319 Europe/Sofia +BM +3217-06446 Atlantic/Bermuda +BN +0456+11455 Asia/Brunei +BO -1630-06809 America/La_Paz +BR -0351-03225 America/Noronha Atlantic islands +BR -0127-04829 America/Belem Amapá, E Pará +BR -0343-03830 America/Fortaleza NE Brazil (MA, PI, CE, RN, PB) +BR -0803-03454 America/Recife Pernambuco +BR -0712-04812 America/Araguaina Tocantins +BR -0940-03543 America/Maceio Alagoas, Sergipe +BR -1259-03831 America/Bahia Bahia +BR -2332-04637 America/Sao_Paulo S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS) +BR -2027-05437 America/Campo_Grande Mato Grosso do Sul +BR -1535-05605 America/Cuiaba Mato Grosso +BR -0226-05452 America/Santarem W Pará +BR -0846-06354 America/Porto_Velho Rondônia +BR +0249-06040 America/Boa_Vista Roraima +BR -0308-06001 America/Manaus E Amazonas +BR -0640-06952 America/Eirunepe W Amazonas +BR -0958-06748 America/Rio_Branco Acre +BS +2505-07721 America/Nassau +BT +2728+08939 Asia/Thimphu +BY +5354+02734 Europe/Minsk +BZ +1730-08812 America/Belize +CA +4734-05243 America/St_Johns Newfoundland Time, including SE Labrador +CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), PEI +CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971 +CA +4606-06447 America/Moncton Atlantic Time - New Brunswick +CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations +CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore +CA +4339-07923 America/Toronto Eastern Time - Ontario & Quebec - most locations +CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973 +CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario +CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut - most locations +CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut +CA +744144-0944945 America/Resolute Central Time - Resolute, Nunavut +CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut +CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut +CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario +CA +4843-09434 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario +CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations +CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest +CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan +CA +690650-1050310 America/Cambridge_Bay Mountain Time - west Nunavut +CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories +CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories +CA +4906-11631 America/Creston Mountain Standard Time - Creston, British Columbia +CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia +CA +4916-12307 America/Vancouver Pacific Time - west British Columbia +CA +6043-13503 America/Whitehorse Pacific Time - south Yukon +CA +6404-13925 America/Dawson Pacific Time - north Yukon +CC -1210+09655 Indian/Cocos +CH,DE,LI +4723+00832 Europe/Zurich Swiss time +CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG +0519-00402 Africa/Abidjan +CK -2114-15946 Pacific/Rarotonga +CL -3327-07040 America/Santiago most locations +CL -2709-10926 Pacific/Easter Easter Island +CN +3114+12128 Asia/Shanghai Beijing Time +CN +4348+08735 Asia/Urumqi Xinjiang Time +CO +0436-07405 America/Bogota +CR +0956-08405 America/Costa_Rica +CU +2308-08222 America/Havana +CV +1455-02331 Atlantic/Cape_Verde +CW,AW,BQ,SX +1211-06900 America/Curacao +CX -1025+10543 Indian/Christmas +CY +3510+03322 Asia/Nicosia +CZ,SK +5005+01426 Europe/Prague +DE +5230+01322 Europe/Berlin Berlin time +DK +5540+01235 Europe/Copenhagen +DO +1828-06954 America/Santo_Domingo +DZ +3647+00303 Africa/Algiers +EC -0210-07950 America/Guayaquil mainland +EC -0054-08936 Pacific/Galapagos Galápagos Islands +EE +5925+02445 Europe/Tallinn +EG +3003+03115 Africa/Cairo +EH +2709-01312 Africa/El_Aaiun +ES +4024-00341 Europe/Madrid mainland +ES +3553-00519 Africa/Ceuta Ceuta & Melilla +ES +2806-01524 Atlantic/Canary Canary Islands +FI,AX +6010+02458 Europe/Helsinki +FJ -1808+17825 Pacific/Fiji +FK -5142-05751 Atlantic/Stanley +FM +0725+15147 Pacific/Chuuk Chuuk (Truk) and Yap +FM +0658+15813 Pacific/Pohnpei Pohnpei (Ponape) +FM +0519+16259 Pacific/Kosrae Kosrae +FO +6201-00646 Atlantic/Faroe +FR +4852+00220 Europe/Paris +GB,GG,IM,JE +513030-0000731 Europe/London +GE +4143+04449 Asia/Tbilisi +GF +0456-05220 America/Cayenne +GH +0533-00013 Africa/Accra +GI +3608-00521 Europe/Gibraltar +GL +6411-05144 America/Godthab most locations +GL +7646-01840 America/Danmarkshavn east coast, north of Scoresbysund +GL +7029-02158 America/Scoresbysund Scoresbysund / Ittoqqortoormiit +GL +7634-06847 America/Thule Thule / Pituffik +GR +3758+02343 Europe/Athens +GS -5416-03632 Atlantic/South_Georgia +GT +1438-09031 America/Guatemala +GU,MP +1328+14445 Pacific/Guam +GW +1151-01535 Africa/Bissau +GY +0648-05810 America/Guyana +HK +2217+11409 Asia/Hong_Kong +HN +1406-08713 America/Tegucigalpa +HT +1832-07220 America/Port-au-Prince +HU +4730+01905 Europe/Budapest +ID -0610+10648 Asia/Jakarta Java & Sumatra +ID -0002+10920 Asia/Pontianak west & central Borneo +ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor +ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) +IE +5320-00615 Europe/Dublin +IL +314650+0351326 Asia/Jerusalem +IN +2232+08822 Asia/Kolkata +IO -0720+07225 Indian/Chagos +IQ +3321+04425 Asia/Baghdad +IR +3540+05126 Asia/Tehran +IS +6409-02151 Atlantic/Reykjavik +IT,SM,VA +4154+01229 Europe/Rome +JM +175805-0764736 America/Jamaica +JO +3157+03556 Asia/Amman +JP +353916+1394441 Asia/Tokyo +KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT -0117+03649 Africa/Nairobi +KG +4254+07436 Asia/Bishkek +KI +0125+17300 Pacific/Tarawa Gilbert Islands +KI -0308-17105 Pacific/Enderbury Phoenix Islands +KI +0152-15720 Pacific/Kiritimati Line Islands +KP +3901+12545 Asia/Pyongyang +KR +3733+12658 Asia/Seoul +KZ +4315+07657 Asia/Almaty most locations +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 +5113+05121 Asia/Oral West Kazakhstan +LB +3353+03530 Asia/Beirut +LK +0656+07951 Asia/Colombo +LR +0618-01047 Africa/Monrovia +LT +5441+02519 Europe/Vilnius +LU +4936+00609 Europe/Luxembourg +LV +5657+02406 Europe/Riga +LY +3254+01311 Africa/Tripoli +MA +3339-00735 Africa/Casablanca +MC +4342+00723 Europe/Monaco +MD +4700+02850 Europe/Chisinau +MH +0709+17112 Pacific/Majuro most locations +MH +0905+16720 Pacific/Kwajalein Kwajalein +MM +1647+09610 Asia/Rangoon +MN +4755+10653 Asia/Ulaanbaatar most locations +MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan +MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar +MO +2214+11335 Asia/Macau +MQ +1436-06105 America/Martinique +MT +3554+01431 Europe/Malta +MU -2010+05730 Indian/Mauritius +MV +0410+07330 Indian/Maldives +MX +1924-09909 America/Mexico_City Central Time - most locations +MX +2105-08646 America/Cancun Central Time - Quintana Roo +MX +2058-08937 America/Merida Central Time - Campeche, Yucatán +MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border +MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border +MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa +MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border +MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border +MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora +MX +3232-11701 America/Tijuana US Pacific Time - Baja California near US border +MX +3018-11452 America/Santa_Isabel Mexican Pacific Time - Baja California away from US border +MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahía de Banderas +MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia +MY +0133+11020 Asia/Kuching Sabah & Sarawak +MZ,BI,BW,CD,MW,RW,ZM,ZW -2558+03235 Africa/Maputo Central Africa Time (UTC+2) +NA -2234+01706 Africa/Windhoek +NC -2216+16627 Pacific/Noumea +NF -2903+16758 Pacific/Norfolk +NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE +0627+00324 Africa/Lagos West Africa Time (UTC+1) +NI +1209-08617 America/Managua +NL +5222+00454 Europe/Amsterdam +NO,SJ +5955+01045 Europe/Oslo +NP +2743+08519 Asia/Kathmandu +NR -0031+16655 Pacific/Nauru +NU -1901-16955 Pacific/Niue +NZ,AQ -3652+17446 Pacific/Auckland New Zealand time +NZ -4357-17633 Pacific/Chatham Chatham Islands +PA,KY +0858-07932 America/Panama +PE -1203-07703 America/Lima +PF -1732-14934 Pacific/Tahiti Society Islands +PF -0900-13930 Pacific/Marquesas Marquesas Islands +PF -2308-13457 Pacific/Gambier Gambier Islands +PG -0930+14710 Pacific/Port_Moresby most locations +PG -0613+15534 Pacific/Bougainville Bougainville +PH +1435+12100 Asia/Manila +PK +2452+06703 Asia/Karachi +PL +5215+02100 Europe/Warsaw +PM +4703-05620 America/Miquelon +PN -2504-13005 Pacific/Pitcairn +PR +182806-0660622 America/Puerto_Rico +PS +3130+03428 Asia/Gaza Gaza Strip +PS +313200+0350542 Asia/Hebron West Bank +PT +3843-00908 Europe/Lisbon mainland +PT +3238-01654 Atlantic/Madeira Madeira Islands +PT +3744-02540 Atlantic/Azores Azores +PW +0720+13429 Pacific/Palau +PY -2516-05740 America/Asuncion +QA,BH +2517+05132 Asia/Qatar +RE,TF -2052+05528 Indian/Reunion Réunion, Crozet Is, Scattered Is +RO +4426+02606 Europe/Bucharest +RS,BA,HR,ME,MK,SI +4450+02030 Europe/Belgrade +RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad +RU +554521+0373704 Europe/Moscow Moscow+00 - west Russia +RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea +RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea +RU +5312+05009 Europe/Samara Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia +RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals +RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia +RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk +RU +5345+08707 Asia/Novokuznetsk Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo +RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River +RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal +RU +5203+11328 Asia/Chita Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky +RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River +RU +623923+1353314 Asia/Khandyga Moscow+06 - Tomponsky, Ust-Maysky +RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River +RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island +RU +643337+1431336 Asia/Ust-Nera Moscow+07 - Oymyakonsky +RU +5934+15048 Asia/Magadan Moscow+08 (Moscow+07 after 2014-10-26) - Magadan +RU +6728+15343 Asia/Srednekolymsk Moscow+08 - E Sakha, N Kuril Is +RU +5301+15839 Asia/Kamchatka Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka +RU +6445+17729 Asia/Anadyr Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea +SA,KW,YE +2438+04643 Asia/Riyadh +SB -0932+16012 Pacific/Guadalcanal +SC -0440+05528 Indian/Mahe +SD,SS +1536+03232 Africa/Khartoum +SE +5920+01803 Europe/Stockholm +SG +0117+10351 Asia/Singapore +SR +0550-05510 America/Paramaribo +SV +1342-08912 America/El_Salvador +SY +3330+03618 Asia/Damascus +TC +2128-07108 America/Grand_Turk +TD +1207+01503 Africa/Ndjamena +TF -492110+0701303 Indian/Kerguelen Kerguelen, St Paul I, Amsterdam I +TH,KH,LA,VN +1345+10031 Asia/Bangkok most of Indochina +TJ +3835+06848 Asia/Dushanbe +TK -0922-17114 Pacific/Fakaofo +TL -0833+12535 Asia/Dili +TM +3757+05823 Asia/Ashgabat +TN +3648+01011 Africa/Tunis +TO -2110-17510 Pacific/Tongatapu +TR +4101+02858 Europe/Istanbul +TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI +1039-06131 America/Port_of_Spain +TV -0831+17913 Pacific/Funafuti +TW +2503+12130 Asia/Taipei +UA +5026+03031 Europe/Kiev most locations +UA +4837+02218 Europe/Uzhgorod Ruthenia +UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk +UM +1917+16637 Pacific/Wake Wake Island +US +404251-0740023 America/New_York Eastern Time +US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations +US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area +US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County +US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations +US +384038-0873143 America/Indiana/Vincennes Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties +US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County +US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County +US +382931-0871643 America/Indiana/Petersburg Eastern Time - Indiana - Pike County +US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County +US +415100-0873900 America/Chicago Central Time +US +375711-0864541 America/Indiana/Tell_City Central Time - Indiana - Perry County +US +411745-0863730 America/Indiana/Knox Central Time - Indiana - Starke County +US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties +US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County +US +465042-1012439 America/North_Dakota/New_Salem Central Time - North Dakota - Morton County (except Mandan area) +US +471551-1014640 America/North_Dakota/Beulah Central Time - North Dakota - Mercer County +US +394421-1045903 America/Denver Mountain Time +US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon +US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo) +US +340308-1181434 America/Los_Angeles Pacific Time +US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska +US +611305-1495401 America/Anchorage Alaska Time +US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle +US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle +US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck +US +643004-1652423 America/Nome Alaska Time - west Alaska +US +515248-1763929 America/Adak Aleutian Islands +US,UM +211825-1575130 Pacific/Honolulu Hawaii time +UY -3453-05611 America/Montevideo +UZ +3940+06648 Asia/Samarkand west Uzbekistan +UZ +4120+06918 Asia/Tashkent east Uzbekistan +VE +1030-06656 America/Caracas +VN +1045+10640 Asia/Ho_Chi_Minh south Vietnam +VU -1740+16825 Pacific/Efate +WF -1318-17610 Pacific/Wallis +WS -1350-17144 Pacific/Apia +ZA,LS,SZ -2615+02800 Africa/Johannesburg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz.egg-info/PKG-INFO new/pytz-2014.9/pytz.egg-info/PKG-INFO --- old/pytz-2014.4/pytz.egg-info/PKG-INFO 2014-06-02 14:47:26.000000000 +0200 +++ new/pytz-2014.9/pytz.egg-info/PKG-INFO 2014-11-03 11:45:31.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pytz -Version: 2014.4 +Version: 2014.9 Summary: World timezone definitions, modern and historical Home-page: http://pythonhosted.org/pytz Author: Stuart Bishop @@ -152,7 +152,7 @@ >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) - '2006-03-27 08:34:59 EST+1100' + '2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = utc.normalize(au_dt.astimezone(utc)) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -168,7 +168,7 @@ >>> au_tz = timezone('Australia/Sydney') >>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz)) >>> au_dt.strftime(fmt) - '2006-03-27 08:34:59 EST+1100' + '2006-03-27 08:34:59 AEDT+1100' >>> utc_dt2 = au_dt.astimezone(utc) >>> utc_dt2.strftime(fmt) '2006-03-26 21:34:59 UTC+0000' @@ -351,30 +351,36 @@ >>> isinstance(pytz.NonExistentTimeError(), pytz.InvalidTimeError) True - Although ``localize()`` handles many cases, it is still not possible - to handle all. In cases where countries change their timezone definitions, - cases like the end-of-daylight-saving-time occur with no way of resolving - the ambiguity. For example, in 1915 Warsaw switched from Warsaw time to - Central European time. So at the stroke of midnight on August 5th 1915 - the clocks were wound back 24 minutes creating an ambiguous time period - that cannot be specified without referring to the timezone abbreviation - or the actual UTC offset. In this case midnight happened twice, neither - time during a daylight saving time period: + + A special case is where countries change their timezone definitions + with no daylight savings time switch. For example, in 1915 Warsaw + switched from Warsaw time to Central European time with no daylight savings + transition. So at the stroke of midnight on August 5th 1915 the clocks + were wound back 24 minutes creating an ambiguous time period that cannot + be specified without referring to the timezone abbreviation or the + actual UTC offset. In this case midnight happened twice, neither time + during a daylight saving time period. pytz handles this transition by + treating the ambiguous period before the switch as daylight savings + time, and the ambiguous period after as standard time. + >>> warsaw = pytz.timezone('Europe/Warsaw') - >>> loc_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False) - >>> loc_dt1.strftime(fmt) + >>> amb_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=True) + >>> amb_dt1.strftime(fmt) '1915-08-04 23:59:59 WMT+0124' - >>> loc_dt2 = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False) - >>> loc_dt2.strftime(fmt) + >>> amb_dt2 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False) + >>> amb_dt2.strftime(fmt) + '1915-08-04 23:59:59 CET+0100' + >>> switch_dt = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False) + >>> switch_dt.strftime(fmt) '1915-08-05 00:00:00 CET+0100' - >>> str(loc_dt2 - loc_dt1) + >>> str(switch_dt - amb_dt1) '0:24:01' + >>> str(switch_dt - amb_dt2) + '0:00:01' - The only way of creating a time during the missing 24 minutes is - converting from another timezone - because neither of the timezones - involved where in daylight saving mode the API simply provides no way - to express it: + The best way of creating a time during an ambiguous time period is + by converting from another timezone such as UTC: >>> utc_dt = datetime(1915, 8, 4, 22, 36, tzinfo=pytz.utc) >>> utc_dt.astimezone(warsaw).strftime(fmt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytz-2014.4/pytz.egg-info/SOURCES.txt new/pytz-2014.9/pytz.egg-info/SOURCES.txt --- old/pytz-2014.4/pytz.egg-info/SOURCES.txt 2014-06-02 14:47:26.000000000 +0200 +++ new/pytz-2014.9/pytz.egg-info/SOURCES.txt 2014-11-03 11:45:31.000000000 +0100 @@ -66,6 +66,7 @@ pytz/zoneinfo/localtime pytz/zoneinfo/posixrules pytz/zoneinfo/zone.tab +pytz/zoneinfo/zone1970.tab pytz/zoneinfo/Africa/Abidjan pytz/zoneinfo/Africa/Accra pytz/zoneinfo/Africa/Addis_Ababa @@ -313,6 +314,7 @@ pytz/zoneinfo/Asia/Bishkek pytz/zoneinfo/Asia/Brunei pytz/zoneinfo/Asia/Calcutta +pytz/zoneinfo/Asia/Chita pytz/zoneinfo/Asia/Choibalsan pytz/zoneinfo/Asia/Chongqing pytz/zoneinfo/Asia/Chungking @@ -370,6 +372,7 @@ pytz/zoneinfo/Asia/Seoul pytz/zoneinfo/Asia/Shanghai pytz/zoneinfo/Asia/Singapore +pytz/zoneinfo/Asia/Srednekolymsk pytz/zoneinfo/Asia/Taipei pytz/zoneinfo/Asia/Tashkent pytz/zoneinfo/Asia/Tbilisi @@ -548,6 +551,7 @@ pytz/zoneinfo/Mexico/General pytz/zoneinfo/Pacific/Apia pytz/zoneinfo/Pacific/Auckland +pytz/zoneinfo/Pacific/Bougainville pytz/zoneinfo/Pacific/Chatham pytz/zoneinfo/Pacific/Chuuk pytz/zoneinfo/Pacific/Easter ++++++ system_zoneinfo.patch ++++++ Index: pytz-2014.9/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): 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: - # 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) + filename = os.path.join('/usr/share/zoneinfo', *name_parts) return open(filename, 'rb') Index: pytz-2014.9/pytz/tzfile.py =================================================================== --- pytz-2014.9.orig/pytz/tzfile.py +++ pytz-2014.9/pytz/tzfile.py @@ -127,7 +127,7 @@ def build_tzinfo(zone, fp): if __name__ == '__main__': import os.path from pprint import pprint - base = os.path.join(os.path.dirname(__file__), 'zoneinfo') + base = '/usr/share/zoneinfo' tz = build_tzinfo('Australia/Melbourne', open(os.path.join(base,'Australia','Melbourne'), 'rb')) tz = build_tzinfo('US/Eastern', -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
