Updated pytz module to support latest timezone changes

morpheus65535 · Jun 21, 2023 · cd01684 · cd01684
1 parent ab3c171
commit cd01684
Show file tree

Hide file tree

Showing 33 changed files with 217 additions and 127 deletions.
diff --git a/libs/pytz/__init__.py b/libs/pytz/__init__.py
@@ -22,8 +22,8 @@
 
 
 # The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2022f'
-VERSION = '2022.6'  # pip compatible version number.
+OLSON_VERSION = '2023c'
+VERSION = '2023.3'  # pip compatible version number.
 __version__ = VERSION
 
 OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
@@ -202,7 +202,7 @@ def _case_insensitive_zone_lookup(zone):
     """case-insensitively matching timezone, else return zone unchanged"""
     global _all_timezones_lower_to_standard
     if _all_timezones_lower_to_standard is None:
-        _all_timezones_lower_to_standard = dict((tz.lower(), tz) for tz in all_timezones)  # noqa
+        _all_timezones_lower_to_standard = dict((tz.lower(), tz) for tz in _all_timezones_unchecked)  # noqa
     return _all_timezones_lower_to_standard.get(zone.lower()) or zone  # noqa
 
 
@@ -514,7 +514,7 @@ def _test():
 
 if __name__ == '__main__':
     _test()
-all_timezones = \
+_all_timezones_unchecked = \
 ['Africa/Abidjan',
  'Africa/Accra',
  'Africa/Addis_Ababa',
@@ -610,6 +610,7 @@ def _test():
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
+ 'America/Ciudad_Juarez',
  'America/Coral_Harbour',
  'America/Cordoba',
  'America/Costa_Rica',
@@ -1111,7 +1112,7 @@ def _test():
  'WET',
  'Zulu']
 all_timezones = LazyList(
-        tz for tz in all_timezones if resource_exists(tz))
+        tz for tz in _all_timezones_unchecked if resource_exists(tz))
 
 all_timezones_set = LazySet(all_timezones)
 common_timezones = \
@@ -1204,6 +1205,7 @@ def _test():
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
+ 'America/Ciudad_Juarez',
  'America/Costa_Rica',
  'America/Creston',
  'America/Cuiaba',
@@ -1275,7 +1277,6 @@ def _test():
  'America/Nuuk',
  'America/Ojinaga',
  'America/Panama',
- 'America/Pangnirtung',
  'America/Paramaribo',
  'America/Phoenix',
  'America/Port-au-Prince',
@@ -1310,7 +1311,6 @@ def _test():
  'America/Whitehorse',
  'America/Winnipeg',
  'America/Yakutat',
- 'America/Yellowknife',
  'Antarctica/Casey',
  'Antarctica/Davis',
  'Antarctica/DumontDUrville',

diff --git a/libs/pytz/tests/test_tzinfo.py b/libs/pytz/tests/test_tzinfo.py
@@ -27,8 +27,8 @@
 
 # I test for expected version to ensure the correct version of pytz is
 # actually being tested.
-EXPECTED_VERSION = '2022.6'
-EXPECTED_OLSON_VERSION = '2022f'
+EXPECTED_VERSION = '2023.3'
+EXPECTED_OLSON_VERSION = '2023c'
 
 fmt = '%Y-%m-%d %H:%M:%S %Z%z'
 

diff --git a/libs/pytz/zoneinfo/Africa/Cairo b/libs/pytz/zoneinfo/Africa/Cairo
diff --git a/libs/pytz/zoneinfo/Africa/Casablanca b/libs/pytz/zoneinfo/Africa/Casablanca
diff --git a/libs/pytz/zoneinfo/Africa/El_Aaiun b/libs/pytz/zoneinfo/Africa/El_Aaiun
diff --git a/libs/pytz/zoneinfo/America/Bogota b/libs/pytz/zoneinfo/America/Bogota
diff --git a/libs/pytz/zoneinfo/America/Cambridge_Bay b/libs/pytz/zoneinfo/America/Cambridge_Bay
diff --git a/libs/pytz/zoneinfo/America/Ciudad_Juarez b/libs/pytz/zoneinfo/America/Ciudad_Juarez
diff --git a/libs/pytz/zoneinfo/America/Godthab b/libs/pytz/zoneinfo/America/Godthab
diff --git a/libs/pytz/zoneinfo/America/Inuvik b/libs/pytz/zoneinfo/America/Inuvik
diff --git a/libs/pytz/zoneinfo/America/Iqaluit b/libs/pytz/zoneinfo/America/Iqaluit
diff --git a/libs/pytz/zoneinfo/America/Nuuk b/libs/pytz/zoneinfo/America/Nuuk
diff --git a/libs/pytz/zoneinfo/America/Ojinaga b/libs/pytz/zoneinfo/America/Ojinaga
diff --git a/libs/pytz/zoneinfo/America/Pangnirtung b/libs/pytz/zoneinfo/America/Pangnirtung
diff --git a/libs/pytz/zoneinfo/America/Rankin_Inlet b/libs/pytz/zoneinfo/America/Rankin_Inlet
diff --git a/libs/pytz/zoneinfo/America/Resolute b/libs/pytz/zoneinfo/America/Resolute
diff --git a/libs/pytz/zoneinfo/America/Whitehorse b/libs/pytz/zoneinfo/America/Whitehorse
diff --git a/libs/pytz/zoneinfo/America/Yellowknife b/libs/pytz/zoneinfo/America/Yellowknife
diff --git a/libs/pytz/zoneinfo/Asia/Gaza b/libs/pytz/zoneinfo/Asia/Gaza
diff --git a/libs/pytz/zoneinfo/Asia/Hebron b/libs/pytz/zoneinfo/Asia/Hebron
diff --git a/libs/pytz/zoneinfo/Asia/Kuala_Lumpur b/libs/pytz/zoneinfo/Asia/Kuala_Lumpur
diff --git a/libs/pytz/zoneinfo/Asia/Singapore b/libs/pytz/zoneinfo/Asia/Singapore
diff --git a/libs/pytz/zoneinfo/Canada/Yukon b/libs/pytz/zoneinfo/Canada/Yukon
diff --git a/libs/pytz/zoneinfo/Egypt b/libs/pytz/zoneinfo/Egypt
diff --git a/libs/pytz/zoneinfo/Europe/Kirov b/libs/pytz/zoneinfo/Europe/Kirov
diff --git a/libs/pytz/zoneinfo/Europe/Volgograd b/libs/pytz/zoneinfo/Europe/Volgograd
diff --git a/libs/pytz/zoneinfo/Singapore b/libs/pytz/zoneinfo/Singapore
diff --git a/libs/pytz/zoneinfo/iso3166.tab b/libs/pytz/zoneinfo/iso3166.tab
@@ -3,13 +3,13 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2015-05-02):
+# From Paul Eggert (2022-11-18):
 # This file contains a table of two-letter country codes.  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.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO 3166-1 N976 (2018-11-06).  See: Updates on ISO 3166-1
+#     ISO 3166-1 N1087 (2022-09-02).  See: Updates on ISO 3166-1
 #     https://isotc.iso.org/livelink/livelink/Open/16944257
 # 2.  The usual English name for the coded region,
 #     chosen so that alphabetic sorting of subsets produces helpful lists.
@@ -238,7 +238,7 @@ SY	Syria
 SZ	Eswatini (Swaziland)
 TC	Turks & Caicos Is
 TD	Chad
-TF	French Southern & Antarctic Lands
+TF	French S. Terr.
 TG	Togo
 TH	Thailand
 TJ	Tajikistan

diff --git a/libs/pytz/zoneinfo/leapseconds b/libs/pytz/zoneinfo/leapseconds
@@ -72,11 +72,11 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2023	Jun	28	00:00:00
+#Expires 2023	Dec	28	00:00:00
 
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1687910400 (2023-06-28 00:00:00 UTC)
+#expires 1703721600 (2023-12-28 00:00:00 UTC)
 
-#	Updated through IERS Bulletin C64
-#	File expires on:  28 June 2023
+#	Updated through IERS Bulletin C65
+#	File expires on:  28 December 2023