From d72d809594ac56d9dcfe5f42436a1a56359acdb3 Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Nov 06 2024 18:19:21 +0000 Subject: Import pytz-2024.1-3.el10s in CloudSIG Epoxy --- diff --git a/.pytz.metadata b/.pytz.metadata index f8fe7d5..a17ba62 100644 --- a/.pytz.metadata +++ b/.pytz.metadata @@ -1 +1 @@ -c2d0024d4a6bd649290813f0a57d849accf82fa9 SOURCES/pytz-2017.2.zip +8a360436683f68447e9fb54a6359988c55e529c8 SOURCES/pytz-2024.1.tar.gz diff --git a/SOURCES/pytz-zoneinfo.patch b/SOURCES/pytz-zoneinfo.patch index 9f17615..70a4f16 100644 --- a/SOURCES/pytz-zoneinfo.patch +++ b/SOURCES/pytz-zoneinfo.patch @@ -1,1103 +1,1105 @@ diff --git a/pytz/__init__.py b/pytz/__init__.py -index 13c83b1..e8a674f 100644 +index e2f49fa..65c1d11 100644 --- a/pytz/__init__.py +++ b/pytz/__init__.py -@@ -70,6 +70,9 @@ else: # Python 2.x +@@ -74,6 +74,9 @@ else: # Python 2.x """ return s.encode('ASCII') -+_tzinfo_dir = os.getenv("TZDIR") or "/usr/share/zoneinfo" ++_tzinfo_dir = os.getenv('PYTZ_TZDATADIR') or '/usr/share/zoneinfo' +if _tzinfo_dir.endswith(os.sep): + _tzinfo_dir = _tzinfo_dir[:-1] def open_resource(name): """Open a resource from the zoneinfo subdir for reading. -@@ -81,19 +84,7 @@ def open_resource(name): +--- pytz-2022.2/pytz/__init__.py~ 2022-08-12 08:18:18.284242046 -0500 ++++ pytz-2022.2/pytz/__init__.py 2022-08-12 08:40:34.523880888 -0500 +@@ -91,23 +91,8 @@ for part in name_parts: - if part == os.path.pardir or os.path.sep in part: + if part == os.path.pardir or os.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): -- # http://bugs.launchpad.net/bugs/383171 - we avoid using this -- # unless absolutely necessary to help when a broken version of -- # pkg_resources is installed. -- try: -- from pkg_resources import resource_stream -- except ImportError: -- resource_stream = None +- zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None) +- if zoneinfo_dir is not None: +- filename = os.path.join(zoneinfo_dir, *name_parts) +- else: +- filename = os.path.join(os.path.dirname(__file__), +- 'zoneinfo', *name_parts) +- 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. +- 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(_tzinfo_dir, *name_parts) +- if resource_stream is not None: +- return resource_stream(__name__, 'zoneinfo/' + name) ++ zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', _tzinfo_dir) ++ filename = os.path.join(zoneinfo_dir, *name_parts) return open(filename, 'rb') - - -@@ -490,1044 +481,33 @@ def _test(): - if __name__ == '__main__': - _test() - --all_timezones = \ --['Africa/Abidjan', -- 'Africa/Accra', -- 'Africa/Addis_Ababa', -- 'Africa/Algiers', -- 'Africa/Asmara', -- 'Africa/Asmera', -- 'Africa/Bamako', -- 'Africa/Bangui', -- 'Africa/Banjul', -- 'Africa/Bissau', -- 'Africa/Blantyre', -- 'Africa/Brazzaville', -- 'Africa/Bujumbura', -- 'Africa/Cairo', -- 'Africa/Casablanca', -- 'Africa/Ceuta', -- 'Africa/Conakry', -- 'Africa/Dakar', -- 'Africa/Dar_es_Salaam', -- 'Africa/Djibouti', -- 'Africa/Douala', -- 'Africa/El_Aaiun', -- 'Africa/Freetown', -- 'Africa/Gaborone', -- 'Africa/Harare', -- 'Africa/Johannesburg', -- 'Africa/Juba', -- 'Africa/Kampala', -- 'Africa/Khartoum', -- 'Africa/Kigali', -- 'Africa/Kinshasa', -- 'Africa/Lagos', -- 'Africa/Libreville', -- 'Africa/Lome', -- 'Africa/Luanda', -- 'Africa/Lubumbashi', -- 'Africa/Lusaka', -- 'Africa/Malabo', -- 'Africa/Maputo', -- 'Africa/Maseru', -- 'Africa/Mbabane', -- 'Africa/Mogadishu', -- 'Africa/Monrovia', -- 'Africa/Nairobi', -- 'Africa/Ndjamena', -- 'Africa/Niamey', -- 'Africa/Nouakchott', -- 'Africa/Ouagadougou', -- 'Africa/Porto-Novo', -- 'Africa/Sao_Tome', -- 'Africa/Timbuktu', -- 'Africa/Tripoli', -- 'Africa/Tunis', -- 'Africa/Windhoek', -- 'America/Adak', -- 'America/Anchorage', -- 'America/Anguilla', -- 'America/Antigua', -- 'America/Araguaina', -- 'America/Argentina/Buenos_Aires', -- 'America/Argentina/Catamarca', -- 'America/Argentina/ComodRivadavia', -- 'America/Argentina/Cordoba', -- 'America/Argentina/Jujuy', -- 'America/Argentina/La_Rioja', -- 'America/Argentina/Mendoza', -- 'America/Argentina/Rio_Gallegos', -- 'America/Argentina/Salta', -- 'America/Argentina/San_Juan', -- 'America/Argentina/San_Luis', -- 'America/Argentina/Tucuman', -- 'America/Argentina/Ushuaia', -- 'America/Aruba', -- 'America/Asuncion', -- 'America/Atikokan', -- 'America/Atka', -- 'America/Bahia', -- 'America/Bahia_Banderas', -- 'America/Barbados', -- 'America/Belem', -- 'America/Belize', -- 'America/Blanc-Sablon', -- 'America/Boa_Vista', -- 'America/Bogota', -- 'America/Boise', -- 'America/Buenos_Aires', -- 'America/Cambridge_Bay', -- 'America/Campo_Grande', -- 'America/Cancun', -- 'America/Caracas', -- 'America/Catamarca', -- 'America/Cayenne', -- 'America/Cayman', -- 'America/Chicago', -- 'America/Chihuahua', -- 'America/Coral_Harbour', -- 'America/Cordoba', -- 'America/Costa_Rica', -- 'America/Creston', -- 'America/Cuiaba', -- 'America/Curacao', -- 'America/Danmarkshavn', -- 'America/Dawson', -- 'America/Dawson_Creek', -- 'America/Denver', -- 'America/Detroit', -- 'America/Dominica', -- 'America/Edmonton', -- 'America/Eirunepe', -- 'America/El_Salvador', -- 'America/Ensenada', -- 'America/Fort_Nelson', -- 'America/Fort_Wayne', -- 'America/Fortaleza', -- 'America/Glace_Bay', -- 'America/Godthab', -- 'America/Goose_Bay', -- 'America/Grand_Turk', -- 'America/Grenada', -- 'America/Guadeloupe', -- 'America/Guatemala', -- 'America/Guayaquil', -- 'America/Guyana', -- 'America/Halifax', -- 'America/Havana', -- 'America/Hermosillo', -- 'America/Indiana/Indianapolis', -- 'America/Indiana/Knox', -- 'America/Indiana/Marengo', -- 'America/Indiana/Petersburg', -- 'America/Indiana/Tell_City', -- 'America/Indiana/Vevay', -- 'America/Indiana/Vincennes', -- 'America/Indiana/Winamac', -- 'America/Indianapolis', -- 'America/Inuvik', -- 'America/Iqaluit', -- 'America/Jamaica', -- 'America/Jujuy', -- 'America/Juneau', -- 'America/Kentucky/Louisville', -- 'America/Kentucky/Monticello', -- 'America/Knox_IN', -- 'America/Kralendijk', -- 'America/La_Paz', -- 'America/Lima', -- 'America/Los_Angeles', -- 'America/Louisville', -- 'America/Lower_Princes', -- 'America/Maceio', -- 'America/Managua', -- 'America/Manaus', -- 'America/Marigot', -- 'America/Martinique', -- 'America/Matamoros', -- 'America/Mazatlan', -- 'America/Mendoza', -- 'America/Menominee', -- 'America/Merida', -- 'America/Metlakatla', -- 'America/Mexico_City', -- 'America/Miquelon', -- 'America/Moncton', -- 'America/Monterrey', -- 'America/Montevideo', -- 'America/Montreal', -- 'America/Montserrat', -- 'America/Nassau', -- 'America/New_York', -- 'America/Nipigon', -- 'America/Nome', -- 'America/Noronha', -- 'America/North_Dakota/Beulah', -- 'America/North_Dakota/Center', -- 'America/North_Dakota/New_Salem', -- 'America/Ojinaga', -- 'America/Panama', -- 'America/Pangnirtung', -- 'America/Paramaribo', -- 'America/Phoenix', -- 'America/Port-au-Prince', -- 'America/Port_of_Spain', -- 'America/Porto_Acre', -- 'America/Porto_Velho', -- 'America/Puerto_Rico', -- 'America/Punta_Arenas', -- 'America/Rainy_River', -- 'America/Rankin_Inlet', -- 'America/Recife', -- 'America/Regina', -- 'America/Resolute', -- 'America/Rio_Branco', -- 'America/Rosario', -- 'America/Santa_Isabel', -- 'America/Santarem', -- 'America/Santiago', -- 'America/Santo_Domingo', -- 'America/Sao_Paulo', -- 'America/Scoresbysund', -- 'America/Shiprock', -- 'America/Sitka', -- 'America/St_Barthelemy', -- 'America/St_Johns', -- 'America/St_Kitts', -- 'America/St_Lucia', -- 'America/St_Thomas', -- 'America/St_Vincent', -- 'America/Swift_Current', -- 'America/Tegucigalpa', -- 'America/Thule', -- 'America/Thunder_Bay', -- 'America/Tijuana', -- 'America/Toronto', -- 'America/Tortola', -- 'America/Vancouver', -- 'America/Virgin', -- 'America/Whitehorse', -- 'America/Winnipeg', -- 'America/Yakutat', -- 'America/Yellowknife', -- 'Antarctica/Casey', -- 'Antarctica/Davis', -- 'Antarctica/DumontDUrville', -- 'Antarctica/Macquarie', -- 'Antarctica/Mawson', -- 'Antarctica/McMurdo', -- 'Antarctica/Palmer', -- 'Antarctica/Rothera', -- 'Antarctica/South_Pole', -- 'Antarctica/Syowa', -- 'Antarctica/Troll', -- 'Antarctica/Vostok', -- 'Arctic/Longyearbyen', -- 'Asia/Aden', -- 'Asia/Almaty', -- 'Asia/Amman', -- 'Asia/Anadyr', -- 'Asia/Aqtau', -- 'Asia/Aqtobe', -- 'Asia/Ashgabat', -- 'Asia/Ashkhabad', -- 'Asia/Atyrau', -- 'Asia/Baghdad', -- 'Asia/Bahrain', -- 'Asia/Baku', -- 'Asia/Bangkok', -- 'Asia/Barnaul', -- 'Asia/Beirut', -- 'Asia/Bishkek', -- 'Asia/Brunei', -- 'Asia/Calcutta', -- 'Asia/Chita', -- 'Asia/Choibalsan', -- 'Asia/Chongqing', -- 'Asia/Chungking', -- 'Asia/Colombo', -- 'Asia/Dacca', -- 'Asia/Damascus', -- 'Asia/Dhaka', -- 'Asia/Dili', -- 'Asia/Dubai', -- 'Asia/Dushanbe', -- 'Asia/Famagusta', -- 'Asia/Gaza', -- 'Asia/Harbin', -- 'Asia/Hebron', -- 'Asia/Ho_Chi_Minh', -- 'Asia/Hong_Kong', -- 'Asia/Hovd', -- 'Asia/Irkutsk', -- 'Asia/Istanbul', -- 'Asia/Jakarta', -- 'Asia/Jayapura', -- 'Asia/Jerusalem', -- 'Asia/Kabul', -- 'Asia/Kamchatka', -- 'Asia/Karachi', -- 'Asia/Kashgar', -- 'Asia/Kathmandu', -- 'Asia/Katmandu', -- 'Asia/Khandyga', -- 'Asia/Kolkata', -- 'Asia/Krasnoyarsk', -- 'Asia/Kuala_Lumpur', -- 'Asia/Kuching', -- 'Asia/Kuwait', -- 'Asia/Macao', -- 'Asia/Macau', -- 'Asia/Magadan', -- 'Asia/Makassar', -- 'Asia/Manila', -- 'Asia/Muscat', -- 'Asia/Nicosia', -- 'Asia/Novokuznetsk', -- 'Asia/Novosibirsk', -- 'Asia/Omsk', -- 'Asia/Oral', -- 'Asia/Phnom_Penh', -- 'Asia/Pontianak', -- 'Asia/Pyongyang', -- 'Asia/Qatar', -- 'Asia/Qyzylorda', -- 'Asia/Rangoon', -- 'Asia/Riyadh', -- 'Asia/Saigon', -- 'Asia/Sakhalin', -- 'Asia/Samarkand', -- 'Asia/Seoul', -- 'Asia/Shanghai', -- 'Asia/Singapore', -- 'Asia/Srednekolymsk', -- 'Asia/Taipei', -- 'Asia/Tashkent', -- 'Asia/Tbilisi', -- 'Asia/Tehran', -- 'Asia/Tel_Aviv', -- 'Asia/Thimbu', -- 'Asia/Thimphu', -- 'Asia/Tokyo', -- 'Asia/Tomsk', -- 'Asia/Ujung_Pandang', -- 'Asia/Ulaanbaatar', -- 'Asia/Ulan_Bator', -- 'Asia/Urumqi', -- 'Asia/Ust-Nera', -- 'Asia/Vientiane', -- 'Asia/Vladivostok', -- 'Asia/Yakutsk', -- 'Asia/Yangon', -- 'Asia/Yekaterinburg', -- 'Asia/Yerevan', -- 'Atlantic/Azores', -- 'Atlantic/Bermuda', -- 'Atlantic/Canary', -- 'Atlantic/Cape_Verde', -- 'Atlantic/Faeroe', -- 'Atlantic/Faroe', -- 'Atlantic/Jan_Mayen', -- 'Atlantic/Madeira', -- 'Atlantic/Reykjavik', -- 'Atlantic/South_Georgia', -- 'Atlantic/St_Helena', -- 'Atlantic/Stanley', -- 'Australia/ACT', -- 'Australia/Adelaide', -- 'Australia/Brisbane', -- 'Australia/Broken_Hill', -- 'Australia/Canberra', -- 'Australia/Currie', -- 'Australia/Darwin', -- 'Australia/Eucla', -- 'Australia/Hobart', -- 'Australia/LHI', -- 'Australia/Lindeman', -- 'Australia/Lord_Howe', -- 'Australia/Melbourne', -- 'Australia/NSW', -- 'Australia/North', -- 'Australia/Perth', -- 'Australia/Queensland', -- 'Australia/South', -- 'Australia/Sydney', -- 'Australia/Tasmania', -- 'Australia/Victoria', -- 'Australia/West', -- 'Australia/Yancowinna', -- 'Brazil/Acre', -- 'Brazil/DeNoronha', -- 'Brazil/East', -- 'Brazil/West', -- 'CET', -- 'CST6CDT', -- 'Canada/Atlantic', -- 'Canada/Central', -- 'Canada/East-Saskatchewan', -- 'Canada/Eastern', -- 'Canada/Mountain', -- 'Canada/Newfoundland', -- 'Canada/Pacific', -- 'Canada/Saskatchewan', -- 'Canada/Yukon', -- 'Chile/Continental', -- 'Chile/EasterIsland', -- 'Cuba', -- 'EET', -- 'EST', -- 'EST5EDT', -- 'Egypt', -- 'Eire', -- 'Etc/GMT', -- 'Etc/GMT+0', -- 'Etc/GMT+1', -- 'Etc/GMT+10', -- 'Etc/GMT+11', -- 'Etc/GMT+12', -- 'Etc/GMT+2', -- 'Etc/GMT+3', -- 'Etc/GMT+4', -- 'Etc/GMT+5', -- 'Etc/GMT+6', -- 'Etc/GMT+7', -- 'Etc/GMT+8', -- 'Etc/GMT+9', -- 'Etc/GMT-0', -- 'Etc/GMT-1', -- 'Etc/GMT-10', -- 'Etc/GMT-11', -- 'Etc/GMT-12', -- 'Etc/GMT-13', -- 'Etc/GMT-14', -- 'Etc/GMT-2', -- 'Etc/GMT-3', -- 'Etc/GMT-4', -- 'Etc/GMT-5', -- 'Etc/GMT-6', -- 'Etc/GMT-7', -- 'Etc/GMT-8', -- 'Etc/GMT-9', -- 'Etc/GMT0', -- 'Etc/Greenwich', -- 'Etc/UCT', -- 'Etc/UTC', -- 'Etc/Universal', -- 'Etc/Zulu', -- 'Europe/Amsterdam', -- 'Europe/Andorra', -- 'Europe/Astrakhan', -- 'Europe/Athens', -- 'Europe/Belfast', -- 'Europe/Belgrade', -- 'Europe/Berlin', -- 'Europe/Bratislava', -- 'Europe/Brussels', -- 'Europe/Bucharest', -- 'Europe/Budapest', -- 'Europe/Busingen', -- 'Europe/Chisinau', -- 'Europe/Copenhagen', -- 'Europe/Dublin', -- 'Europe/Gibraltar', -- 'Europe/Guernsey', -- 'Europe/Helsinki', -- 'Europe/Isle_of_Man', -- 'Europe/Istanbul', -- 'Europe/Jersey', -- 'Europe/Kaliningrad', -- 'Europe/Kiev', -- 'Europe/Kirov', -- 'Europe/Lisbon', -- 'Europe/Ljubljana', -- 'Europe/London', -- 'Europe/Luxembourg', -- 'Europe/Madrid', -- 'Europe/Malta', -- 'Europe/Mariehamn', -- 'Europe/Minsk', -- 'Europe/Monaco', -- 'Europe/Moscow', -- 'Europe/Nicosia', -- 'Europe/Oslo', -- 'Europe/Paris', -- 'Europe/Podgorica', -- 'Europe/Prague', -- 'Europe/Riga', -- 'Europe/Rome', -- 'Europe/Samara', -- 'Europe/San_Marino', -- 'Europe/Sarajevo', -- 'Europe/Saratov', -- 'Europe/Simferopol', -- 'Europe/Skopje', -- 'Europe/Sofia', -- 'Europe/Stockholm', -- 'Europe/Tallinn', -- 'Europe/Tirane', -- 'Europe/Tiraspol', -- 'Europe/Ulyanovsk', -- 'Europe/Uzhgorod', -- 'Europe/Vaduz', -- 'Europe/Vatican', -- 'Europe/Vienna', -- 'Europe/Vilnius', -- 'Europe/Volgograd', -- 'Europe/Warsaw', -- 'Europe/Zagreb', -- 'Europe/Zaporozhye', -- 'Europe/Zurich', -- 'GB', -- 'GB-Eire', -- 'GMT', -- 'GMT+0', -- 'GMT-0', -- 'GMT0', -- 'Greenwich', -- 'HST', -- 'Hongkong', -- 'Iceland', -- 'Indian/Antananarivo', -- 'Indian/Chagos', -- 'Indian/Christmas', -- 'Indian/Cocos', -- 'Indian/Comoro', -- 'Indian/Kerguelen', -- 'Indian/Mahe', -- 'Indian/Maldives', -- 'Indian/Mauritius', -- 'Indian/Mayotte', -- 'Indian/Reunion', -- 'Iran', -- 'Israel', -- 'Jamaica', -- 'Japan', -- 'Kwajalein', -- 'Libya', -- 'MET', -- 'MST', -- 'MST7MDT', -- 'Mexico/BajaNorte', -- 'Mexico/BajaSur', -- 'Mexico/General', -- 'NZ', -- 'NZ-CHAT', -- 'Navajo', -- 'PRC', -- 'PST8PDT', -- 'Pacific/Apia', -- 'Pacific/Auckland', -- 'Pacific/Bougainville', -- 'Pacific/Chatham', -- 'Pacific/Chuuk', -- 'Pacific/Easter', -- 'Pacific/Efate', -- 'Pacific/Enderbury', -- 'Pacific/Fakaofo', -- 'Pacific/Fiji', -- 'Pacific/Funafuti', -- 'Pacific/Galapagos', -- 'Pacific/Gambier', -- 'Pacific/Guadalcanal', -- 'Pacific/Guam', -- 'Pacific/Honolulu', -- 'Pacific/Johnston', -- 'Pacific/Kiritimati', -- 'Pacific/Kosrae', -- 'Pacific/Kwajalein', -- 'Pacific/Majuro', -- 'Pacific/Marquesas', -- 'Pacific/Midway', -- 'Pacific/Nauru', -- 'Pacific/Niue', -- 'Pacific/Norfolk', -- 'Pacific/Noumea', -- 'Pacific/Pago_Pago', -- 'Pacific/Palau', -- 'Pacific/Pitcairn', -- 'Pacific/Pohnpei', -- 'Pacific/Ponape', -- 'Pacific/Port_Moresby', -- 'Pacific/Rarotonga', -- 'Pacific/Saipan', -- 'Pacific/Samoa', -- 'Pacific/Tahiti', -- 'Pacific/Tarawa', -- 'Pacific/Tongatapu', -- 'Pacific/Truk', -- 'Pacific/Wake', -- 'Pacific/Wallis', -- 'Pacific/Yap', -- 'Poland', -- 'Portugal', -- 'ROC', -- 'ROK', -- 'Singapore', -- 'Turkey', -- 'UCT', -- 'US/Alaska', -- 'US/Aleutian', -- 'US/Arizona', -- 'US/Central', -- 'US/East-Indiana', -- 'US/Eastern', -- 'US/Hawaii', -- 'US/Indiana-Starke', -- 'US/Michigan', -- 'US/Mountain', -- 'US/Pacific', -- 'US/Pacific-New', -- 'US/Samoa', -- 'UTC', -- 'Universal', -- 'W-SU', -- 'WET', -- 'Zulu'] -+all_timezones = [] -+for root, dirs, files in os.walk(_tzinfo_dir): -+ for exclude in 'posix', 'right': -+ if exclude in dirs: -+ del dirs[dirs.index(exclude)] -+ -+ all_timezones.extend(os.path.join(root, tz_file)[len(_tzinfo_dir)+1:] -+ for tz_file in files -+ if tz_file != 'README' and tz_file != 'Theory' -+ and '.' not in tz_file) - all_timezones = LazyList( - tz for tz in all_timezones if resource_exists(tz)) - - all_timezones_set = LazySet(all_timezones) --common_timezones = \ --['Africa/Abidjan', -- 'Africa/Accra', -- 'Africa/Addis_Ababa', -- 'Africa/Algiers', -- 'Africa/Asmara', -- 'Africa/Bamako', -- 'Africa/Bangui', -- 'Africa/Banjul', -- 'Africa/Bissau', -- 'Africa/Blantyre', -- 'Africa/Brazzaville', -- 'Africa/Bujumbura', -- 'Africa/Cairo', -- 'Africa/Casablanca', -- 'Africa/Ceuta', -- 'Africa/Conakry', -- 'Africa/Dakar', -- 'Africa/Dar_es_Salaam', -- 'Africa/Djibouti', -- 'Africa/Douala', -- 'Africa/El_Aaiun', -- 'Africa/Freetown', -- 'Africa/Gaborone', -- 'Africa/Harare', -- 'Africa/Johannesburg', -- 'Africa/Juba', -- 'Africa/Kampala', -- 'Africa/Khartoum', -- 'Africa/Kigali', -- 'Africa/Kinshasa', -- 'Africa/Lagos', -- 'Africa/Libreville', -- 'Africa/Lome', -- 'Africa/Luanda', -- 'Africa/Lubumbashi', -- 'Africa/Lusaka', -- 'Africa/Malabo', -- 'Africa/Maputo', -- 'Africa/Maseru', -- 'Africa/Mbabane', -- 'Africa/Mogadishu', -- 'Africa/Monrovia', -- 'Africa/Nairobi', -- 'Africa/Ndjamena', -- 'Africa/Niamey', -- 'Africa/Nouakchott', -- 'Africa/Ouagadougou', -- 'Africa/Porto-Novo', -- 'Africa/Sao_Tome', -- 'Africa/Tripoli', -- 'Africa/Tunis', -- 'Africa/Windhoek', -- 'America/Adak', -- 'America/Anchorage', -- 'America/Anguilla', -- 'America/Antigua', -- 'America/Araguaina', -- 'America/Argentina/Buenos_Aires', -- 'America/Argentina/Catamarca', -- 'America/Argentina/Cordoba', -- 'America/Argentina/Jujuy', -- 'America/Argentina/La_Rioja', -- 'America/Argentina/Mendoza', -- 'America/Argentina/Rio_Gallegos', -- 'America/Argentina/Salta', -- 'America/Argentina/San_Juan', -- 'America/Argentina/San_Luis', -- 'America/Argentina/Tucuman', -- 'America/Argentina/Ushuaia', -- 'America/Aruba', -- 'America/Asuncion', -- 'America/Atikokan', -- 'America/Bahia', -- 'America/Bahia_Banderas', -- 'America/Barbados', -- 'America/Belem', -- 'America/Belize', -- 'America/Blanc-Sablon', -- 'America/Boa_Vista', -- 'America/Bogota', -- 'America/Boise', -- 'America/Cambridge_Bay', -- 'America/Campo_Grande', -- 'America/Cancun', -- 'America/Caracas', -- 'America/Cayenne', -- 'America/Cayman', -- 'America/Chicago', -- 'America/Chihuahua', -- 'America/Costa_Rica', -- 'America/Creston', -- 'America/Cuiaba', -- 'America/Curacao', -- 'America/Danmarkshavn', -- 'America/Dawson', -- 'America/Dawson_Creek', -- 'America/Denver', -- 'America/Detroit', -- 'America/Dominica', -- 'America/Edmonton', -- 'America/Eirunepe', -- 'America/El_Salvador', -- 'America/Fort_Nelson', -- 'America/Fortaleza', -- 'America/Glace_Bay', -- 'America/Godthab', -- 'America/Goose_Bay', -- 'America/Grand_Turk', -- 'America/Grenada', -- 'America/Guadeloupe', -- 'America/Guatemala', -- 'America/Guayaquil', -- 'America/Guyana', -- 'America/Halifax', -- 'America/Havana', -- 'America/Hermosillo', -- 'America/Indiana/Indianapolis', -- 'America/Indiana/Knox', -- 'America/Indiana/Marengo', -- 'America/Indiana/Petersburg', -- 'America/Indiana/Tell_City', -- 'America/Indiana/Vevay', -- 'America/Indiana/Vincennes', -- 'America/Indiana/Winamac', -- 'America/Inuvik', -- 'America/Iqaluit', -- 'America/Jamaica', -- 'America/Juneau', -- 'America/Kentucky/Louisville', -- 'America/Kentucky/Monticello', -- 'America/Kralendijk', -- 'America/La_Paz', -- 'America/Lima', -- 'America/Los_Angeles', -- 'America/Lower_Princes', -- 'America/Maceio', -- 'America/Managua', -- 'America/Manaus', -- 'America/Marigot', -- 'America/Martinique', -- 'America/Matamoros', -- 'America/Mazatlan', -- 'America/Menominee', -- 'America/Merida', -- 'America/Metlakatla', -- 'America/Mexico_City', -- 'America/Miquelon', -- 'America/Moncton', -- 'America/Monterrey', -- 'America/Montevideo', -- 'America/Montserrat', -- 'America/Nassau', -- 'America/New_York', -- 'America/Nipigon', -- 'America/Nome', -- 'America/Noronha', -- 'America/North_Dakota/Beulah', -- 'America/North_Dakota/Center', -- 'America/North_Dakota/New_Salem', -- 'America/Ojinaga', -- 'America/Panama', -- 'America/Pangnirtung', -- 'America/Paramaribo', -- 'America/Phoenix', -- 'America/Port-au-Prince', -- 'America/Port_of_Spain', -- 'America/Porto_Velho', -- 'America/Puerto_Rico', -- 'America/Punta_Arenas', -- 'America/Rainy_River', -- 'America/Rankin_Inlet', -- 'America/Recife', -- 'America/Regina', -- 'America/Resolute', -- 'America/Rio_Branco', -- 'America/Santarem', -- 'America/Santiago', -- 'America/Santo_Domingo', -- 'America/Sao_Paulo', -- 'America/Scoresbysund', -- 'America/Sitka', -- 'America/St_Barthelemy', -- 'America/St_Johns', -- 'America/St_Kitts', -- 'America/St_Lucia', -- 'America/St_Thomas', -- 'America/St_Vincent', -- 'America/Swift_Current', -- 'America/Tegucigalpa', -- 'America/Thule', -- 'America/Thunder_Bay', -- 'America/Tijuana', -- 'America/Toronto', -- 'America/Tortola', -- 'America/Vancouver', -- 'America/Whitehorse', -- 'America/Winnipeg', -- 'America/Yakutat', -- 'America/Yellowknife', -- 'Antarctica/Casey', -- 'Antarctica/Davis', -- 'Antarctica/DumontDUrville', -- 'Antarctica/Macquarie', -- 'Antarctica/Mawson', -- 'Antarctica/McMurdo', -- 'Antarctica/Palmer', -- 'Antarctica/Rothera', -- 'Antarctica/Syowa', -- 'Antarctica/Troll', -- 'Antarctica/Vostok', -- 'Arctic/Longyearbyen', -- 'Asia/Aden', -- 'Asia/Almaty', -- 'Asia/Amman', -- 'Asia/Anadyr', -- 'Asia/Aqtau', -- 'Asia/Aqtobe', -- 'Asia/Ashgabat', -- 'Asia/Atyrau', -- 'Asia/Baghdad', -- 'Asia/Bahrain', -- 'Asia/Baku', -- 'Asia/Bangkok', -- 'Asia/Barnaul', -- 'Asia/Beirut', -- 'Asia/Bishkek', -- 'Asia/Brunei', -- 'Asia/Chita', -- 'Asia/Choibalsan', -- 'Asia/Colombo', -- 'Asia/Damascus', -- 'Asia/Dhaka', -- 'Asia/Dili', -- 'Asia/Dubai', -- 'Asia/Dushanbe', -- 'Asia/Famagusta', -- 'Asia/Gaza', -- 'Asia/Hebron', -- 'Asia/Ho_Chi_Minh', -- 'Asia/Hong_Kong', -- 'Asia/Hovd', -- 'Asia/Irkutsk', -- 'Asia/Jakarta', -- 'Asia/Jayapura', -- 'Asia/Jerusalem', -- 'Asia/Kabul', -- 'Asia/Kamchatka', -- 'Asia/Karachi', -- 'Asia/Kathmandu', -- 'Asia/Khandyga', -- 'Asia/Kolkata', -- 'Asia/Krasnoyarsk', -- 'Asia/Kuala_Lumpur', -- 'Asia/Kuching', -- 'Asia/Kuwait', -- 'Asia/Macau', -- 'Asia/Magadan', -- 'Asia/Makassar', -- 'Asia/Manila', -- 'Asia/Muscat', -- 'Asia/Nicosia', -- 'Asia/Novokuznetsk', -- 'Asia/Novosibirsk', -- 'Asia/Omsk', -- 'Asia/Oral', -- 'Asia/Phnom_Penh', -- 'Asia/Pontianak', -- 'Asia/Pyongyang', -- 'Asia/Qatar', -- 'Asia/Qyzylorda', -- 'Asia/Riyadh', -- 'Asia/Sakhalin', -- 'Asia/Samarkand', -- 'Asia/Seoul', -- 'Asia/Shanghai', -- 'Asia/Singapore', -- 'Asia/Srednekolymsk', -- 'Asia/Taipei', -- 'Asia/Tashkent', -- 'Asia/Tbilisi', -- 'Asia/Tehran', -- 'Asia/Thimphu', -- 'Asia/Tokyo', -- 'Asia/Tomsk', -- 'Asia/Ulaanbaatar', -- 'Asia/Urumqi', -- 'Asia/Ust-Nera', -- 'Asia/Vientiane', -- 'Asia/Vladivostok', -- 'Asia/Yakutsk', -- 'Asia/Yangon', -- 'Asia/Yekaterinburg', -- 'Asia/Yerevan', -- 'Atlantic/Azores', -- 'Atlantic/Bermuda', -- 'Atlantic/Canary', -- 'Atlantic/Cape_Verde', -- 'Atlantic/Faroe', -- 'Atlantic/Madeira', -- 'Atlantic/Reykjavik', -- 'Atlantic/South_Georgia', -- 'Atlantic/St_Helena', -- 'Atlantic/Stanley', -- 'Australia/Adelaide', -- 'Australia/Brisbane', -- 'Australia/Broken_Hill', -- 'Australia/Currie', -- 'Australia/Darwin', -- 'Australia/Eucla', -- 'Australia/Hobart', -- 'Australia/Lindeman', -- 'Australia/Lord_Howe', -- 'Australia/Melbourne', -- 'Australia/Perth', -- 'Australia/Sydney', -- 'Canada/Atlantic', -- 'Canada/Central', -- 'Canada/Eastern', -- 'Canada/Mountain', -- 'Canada/Newfoundland', -- 'Canada/Pacific', -- 'Europe/Amsterdam', -- 'Europe/Andorra', -- 'Europe/Astrakhan', -- 'Europe/Athens', -- 'Europe/Belgrade', -- 'Europe/Berlin', -- 'Europe/Bratislava', -- 'Europe/Brussels', -- 'Europe/Bucharest', -- 'Europe/Budapest', -- 'Europe/Busingen', -- 'Europe/Chisinau', -- 'Europe/Copenhagen', -- 'Europe/Dublin', -- 'Europe/Gibraltar', -- 'Europe/Guernsey', -- 'Europe/Helsinki', -- 'Europe/Isle_of_Man', -- 'Europe/Istanbul', -- 'Europe/Jersey', -- 'Europe/Kaliningrad', -- 'Europe/Kiev', -- 'Europe/Kirov', -- 'Europe/Lisbon', -- 'Europe/Ljubljana', -- 'Europe/London', -- 'Europe/Luxembourg', -- 'Europe/Madrid', -- 'Europe/Malta', -- 'Europe/Mariehamn', -- 'Europe/Minsk', -- 'Europe/Monaco', -- 'Europe/Moscow', -- 'Europe/Oslo', -- 'Europe/Paris', -- 'Europe/Podgorica', -- 'Europe/Prague', -- 'Europe/Riga', -- 'Europe/Rome', -- 'Europe/Samara', -- 'Europe/San_Marino', -- 'Europe/Sarajevo', -- 'Europe/Saratov', -- 'Europe/Simferopol', -- 'Europe/Skopje', -- 'Europe/Sofia', -- 'Europe/Stockholm', -- 'Europe/Tallinn', -- 'Europe/Tirane', -- 'Europe/Ulyanovsk', -- 'Europe/Uzhgorod', -- 'Europe/Vaduz', -- 'Europe/Vatican', -- 'Europe/Vienna', -- 'Europe/Vilnius', -- 'Europe/Volgograd', -- 'Europe/Warsaw', -- 'Europe/Zagreb', -- 'Europe/Zaporozhye', -- 'Europe/Zurich', -- 'GMT', -- 'Indian/Antananarivo', -- 'Indian/Chagos', -- 'Indian/Christmas', -- 'Indian/Cocos', -- 'Indian/Comoro', -- 'Indian/Kerguelen', -- 'Indian/Mahe', -- 'Indian/Maldives', -- 'Indian/Mauritius', -- 'Indian/Mayotte', -- 'Indian/Reunion', -- 'Pacific/Apia', -- 'Pacific/Auckland', -- 'Pacific/Bougainville', -- 'Pacific/Chatham', -- 'Pacific/Chuuk', -- 'Pacific/Easter', -- 'Pacific/Efate', -- 'Pacific/Enderbury', -- 'Pacific/Fakaofo', -- 'Pacific/Fiji', -- 'Pacific/Funafuti', -- 'Pacific/Galapagos', -- 'Pacific/Gambier', -- 'Pacific/Guadalcanal', -- 'Pacific/Guam', -- 'Pacific/Honolulu', -- 'Pacific/Kiritimati', -- 'Pacific/Kosrae', -- 'Pacific/Kwajalein', -- 'Pacific/Majuro', -- 'Pacific/Marquesas', -- 'Pacific/Midway', -- 'Pacific/Nauru', -- 'Pacific/Niue', -- 'Pacific/Norfolk', -- 'Pacific/Noumea', -- 'Pacific/Pago_Pago', -- 'Pacific/Palau', -- 'Pacific/Pitcairn', -- 'Pacific/Pohnpei', -- 'Pacific/Port_Moresby', -- 'Pacific/Rarotonga', -- 'Pacific/Saipan', -- 'Pacific/Tahiti', -- 'Pacific/Tarawa', -- 'Pacific/Tongatapu', -- 'Pacific/Wake', -- 'Pacific/Wallis', -- 'US/Alaska', -- 'US/Arizona', -- 'US/Central', -- 'US/Eastern', -- 'US/Hawaii', -- 'US/Mountain', -- 'US/Pacific', -- 'UTC'] -+common_timezones = [l.split()[2] -+ for l in open(os.path.join(_tzinfo_dir, 'zone.tab')) -+ if l != '' and l[0] != '#'] -+common_timezones.extend( -+ ['GMT', -+ 'US/Alaska', -+ 'US/Arizona', -+ 'US/Central', -+ 'US/Eastern', -+ 'US/Hawaii', -+ 'US/Mountain', -+ 'US/Pacific', -+ 'UTC']) - common_timezones = LazyList( - tz for tz in common_timezones if tz in all_timezones) - + + +505,1100c505,515 +< all_timezones = \ +< ['Africa/Abidjan', +< 'Africa/Accra', +< 'Africa/Addis_Ababa', +< 'Africa/Algiers', +< 'Africa/Asmara', +< 'Africa/Asmera', +< 'Africa/Bamako', +< 'Africa/Bangui', +< 'Africa/Banjul', +< 'Africa/Bissau', +< 'Africa/Blantyre', +< 'Africa/Brazzaville', +< 'Africa/Bujumbura', +< 'Africa/Cairo', +< 'Africa/Casablanca', +< 'Africa/Ceuta', +< 'Africa/Conakry', +< 'Africa/Dakar', +< 'Africa/Dar_es_Salaam', +< 'Africa/Djibouti', +< 'Africa/Douala', +< 'Africa/El_Aaiun', +< 'Africa/Freetown', +< 'Africa/Gaborone', +< 'Africa/Harare', +< 'Africa/Johannesburg', +< 'Africa/Juba', +< 'Africa/Kampala', +< 'Africa/Khartoum', +< 'Africa/Kigali', +< 'Africa/Kinshasa', +< 'Africa/Lagos', +< 'Africa/Libreville', +< 'Africa/Lome', +< 'Africa/Luanda', +< 'Africa/Lubumbashi', +< 'Africa/Lusaka', +< 'Africa/Malabo', +< 'Africa/Maputo', +< 'Africa/Maseru', +< 'Africa/Mbabane', +< 'Africa/Mogadishu', +< 'Africa/Monrovia', +< 'Africa/Nairobi', +< 'Africa/Ndjamena', +< 'Africa/Niamey', +< 'Africa/Nouakchott', +< 'Africa/Ouagadougou', +< 'Africa/Porto-Novo', +< 'Africa/Sao_Tome', +< 'Africa/Timbuktu', +< 'Africa/Tripoli', +< 'Africa/Tunis', +< 'Africa/Windhoek', +< 'America/Adak', +< 'America/Anchorage', +< 'America/Anguilla', +< 'America/Antigua', +< 'America/Araguaina', +< 'America/Argentina/Buenos_Aires', +< 'America/Argentina/Catamarca', +< 'America/Argentina/ComodRivadavia', +< 'America/Argentina/Cordoba', +< 'America/Argentina/Jujuy', +< 'America/Argentina/La_Rioja', +< 'America/Argentina/Mendoza', +< 'America/Argentina/Rio_Gallegos', +< 'America/Argentina/Salta', +< 'America/Argentina/San_Juan', +< 'America/Argentina/San_Luis', +< 'America/Argentina/Tucuman', +< 'America/Argentina/Ushuaia', +< 'America/Aruba', +< 'America/Asuncion', +< 'America/Atikokan', +< 'America/Atka', +< 'America/Bahia', +< 'America/Bahia_Banderas', +< 'America/Barbados', +< 'America/Belem', +< 'America/Belize', +< 'America/Blanc-Sablon', +< 'America/Boa_Vista', +< 'America/Bogota', +< 'America/Boise', +< 'America/Buenos_Aires', +< 'America/Cambridge_Bay', +< 'America/Campo_Grande', +< 'America/Cancun', +< 'America/Caracas', +< 'America/Catamarca', +< 'America/Cayenne', +< 'America/Cayman', +< 'America/Chicago', +< 'America/Chihuahua', +< 'America/Coral_Harbour', +< 'America/Cordoba', +< 'America/Costa_Rica', +< 'America/Creston', +< 'America/Cuiaba', +< 'America/Curacao', +< 'America/Danmarkshavn', +< 'America/Dawson', +< 'America/Dawson_Creek', +< 'America/Denver', +< 'America/Detroit', +< 'America/Dominica', +< 'America/Edmonton', +< 'America/Eirunepe', +< 'America/El_Salvador', +< 'America/Ensenada', +< 'America/Fort_Nelson', +< 'America/Fort_Wayne', +< 'America/Fortaleza', +< 'America/Glace_Bay', +< 'America/Godthab', +< 'America/Goose_Bay', +< 'America/Grand_Turk', +< 'America/Grenada', +< 'America/Guadeloupe', +< 'America/Guatemala', +< 'America/Guayaquil', +< 'America/Guyana', +< 'America/Halifax', +< 'America/Havana', +< 'America/Hermosillo', +< 'America/Indiana/Indianapolis', +< 'America/Indiana/Knox', +< 'America/Indiana/Marengo', +< 'America/Indiana/Petersburg', +< 'America/Indiana/Tell_City', +< 'America/Indiana/Vevay', +< 'America/Indiana/Vincennes', +< 'America/Indiana/Winamac', +< 'America/Indianapolis', +< 'America/Inuvik', +< 'America/Iqaluit', +< 'America/Jamaica', +< 'America/Jujuy', +< 'America/Juneau', +< 'America/Kentucky/Louisville', +< 'America/Kentucky/Monticello', +< 'America/Knox_IN', +< 'America/Kralendijk', +< 'America/La_Paz', +< 'America/Lima', +< 'America/Los_Angeles', +< 'America/Louisville', +< 'America/Lower_Princes', +< 'America/Maceio', +< 'America/Managua', +< 'America/Manaus', +< 'America/Marigot', +< 'America/Martinique', +< 'America/Matamoros', +< 'America/Mazatlan', +< 'America/Mendoza', +< 'America/Menominee', +< 'America/Merida', +< 'America/Metlakatla', +< 'America/Mexico_City', +< 'America/Miquelon', +< 'America/Moncton', +< 'America/Monterrey', +< 'America/Montevideo', +< 'America/Montreal', +< 'America/Montserrat', +< 'America/Nassau', +< 'America/New_York', +< 'America/Nipigon', +< 'America/Nome', +< 'America/Noronha', +< 'America/North_Dakota/Beulah', +< 'America/North_Dakota/Center', +< 'America/North_Dakota/New_Salem', +< 'America/Nuuk', +< 'America/Ojinaga', +< 'America/Panama', +< 'America/Pangnirtung', +< 'America/Paramaribo', +< 'America/Phoenix', +< 'America/Port-au-Prince', +< 'America/Port_of_Spain', +< 'America/Porto_Acre', +< 'America/Porto_Velho', +< 'America/Puerto_Rico', +< 'America/Punta_Arenas', +< 'America/Rainy_River', +< 'America/Rankin_Inlet', +< 'America/Recife', +< 'America/Regina', +< 'America/Resolute', +< 'America/Rio_Branco', +< 'America/Rosario', +< 'America/Santa_Isabel', +< 'America/Santarem', +< 'America/Santiago', +< 'America/Santo_Domingo', +< 'America/Sao_Paulo', +< 'America/Scoresbysund', +< 'America/Shiprock', +< 'America/Sitka', +< 'America/St_Barthelemy', +< 'America/St_Johns', +< 'America/St_Kitts', +< 'America/St_Lucia', +< 'America/St_Thomas', +< 'America/St_Vincent', +< 'America/Swift_Current', +< 'America/Tegucigalpa', +< 'America/Thule', +< 'America/Thunder_Bay', +< 'America/Tijuana', +< 'America/Toronto', +< 'America/Tortola', +< 'America/Vancouver', +< 'America/Virgin', +< 'America/Whitehorse', +< 'America/Winnipeg', +< 'America/Yakutat', +< 'America/Yellowknife', +< 'Antarctica/Casey', +< 'Antarctica/Davis', +< 'Antarctica/DumontDUrville', +< 'Antarctica/Macquarie', +< 'Antarctica/Mawson', +< 'Antarctica/McMurdo', +< 'Antarctica/Palmer', +< 'Antarctica/Rothera', +< 'Antarctica/South_Pole', +< 'Antarctica/Syowa', +< 'Antarctica/Troll', +< 'Antarctica/Vostok', +< 'Arctic/Longyearbyen', +< 'Asia/Aden', +< 'Asia/Almaty', +< 'Asia/Amman', +< 'Asia/Anadyr', +< 'Asia/Aqtau', +< 'Asia/Aqtobe', +< 'Asia/Ashgabat', +< 'Asia/Ashkhabad', +< 'Asia/Atyrau', +< 'Asia/Baghdad', +< 'Asia/Bahrain', +< 'Asia/Baku', +< 'Asia/Bangkok', +< 'Asia/Barnaul', +< 'Asia/Beirut', +< 'Asia/Bishkek', +< 'Asia/Brunei', +< 'Asia/Calcutta', +< 'Asia/Chita', +< 'Asia/Choibalsan', +< 'Asia/Chongqing', +< 'Asia/Chungking', +< 'Asia/Colombo', +< 'Asia/Dacca', +< 'Asia/Damascus', +< 'Asia/Dhaka', +< 'Asia/Dili', +< 'Asia/Dubai', +< 'Asia/Dushanbe', +< 'Asia/Famagusta', +< 'Asia/Gaza', +< 'Asia/Harbin', +< 'Asia/Hebron', +< 'Asia/Ho_Chi_Minh', +< 'Asia/Hong_Kong', +< 'Asia/Hovd', +< 'Asia/Irkutsk', +< 'Asia/Istanbul', +< 'Asia/Jakarta', +< 'Asia/Jayapura', +< 'Asia/Jerusalem', +< 'Asia/Kabul', +< 'Asia/Kamchatka', +< 'Asia/Karachi', +< 'Asia/Kashgar', +< 'Asia/Kathmandu', +< 'Asia/Katmandu', +< 'Asia/Khandyga', +< 'Asia/Kolkata', +< 'Asia/Krasnoyarsk', +< 'Asia/Kuala_Lumpur', +< 'Asia/Kuching', +< 'Asia/Kuwait', +< 'Asia/Macao', +< 'Asia/Macau', +< 'Asia/Magadan', +< 'Asia/Makassar', +< 'Asia/Manila', +< 'Asia/Muscat', +< 'Asia/Nicosia', +< 'Asia/Novokuznetsk', +< 'Asia/Novosibirsk', +< 'Asia/Omsk', +< 'Asia/Oral', +< 'Asia/Phnom_Penh', +< 'Asia/Pontianak', +< 'Asia/Pyongyang', +< 'Asia/Qatar', +< 'Asia/Qostanay', +< 'Asia/Qyzylorda', +< 'Asia/Rangoon', +< 'Asia/Riyadh', +< 'Asia/Saigon', +< 'Asia/Sakhalin', +< 'Asia/Samarkand', +< 'Asia/Seoul', +< 'Asia/Shanghai', +< 'Asia/Singapore', +< 'Asia/Srednekolymsk', +< 'Asia/Taipei', +< 'Asia/Tashkent', +< 'Asia/Tbilisi', +< 'Asia/Tehran', +< 'Asia/Tel_Aviv', +< 'Asia/Thimbu', +< 'Asia/Thimphu', +< 'Asia/Tokyo', +< 'Asia/Tomsk', +< 'Asia/Ujung_Pandang', +< 'Asia/Ulaanbaatar', +< 'Asia/Ulan_Bator', +< 'Asia/Urumqi', +< 'Asia/Ust-Nera', +< 'Asia/Vientiane', +< 'Asia/Vladivostok', +< 'Asia/Yakutsk', +< 'Asia/Yangon', +< 'Asia/Yekaterinburg', +< 'Asia/Yerevan', +< 'Atlantic/Azores', +< 'Atlantic/Bermuda', +< 'Atlantic/Canary', +< 'Atlantic/Cape_Verde', +< 'Atlantic/Faeroe', +< 'Atlantic/Faroe', +< 'Atlantic/Jan_Mayen', +< 'Atlantic/Madeira', +< 'Atlantic/Reykjavik', +< 'Atlantic/South_Georgia', +< 'Atlantic/St_Helena', +< 'Atlantic/Stanley', +< 'Australia/ACT', +< 'Australia/Adelaide', +< 'Australia/Brisbane', +< 'Australia/Broken_Hill', +< 'Australia/Canberra', +< 'Australia/Currie', +< 'Australia/Darwin', +< 'Australia/Eucla', +< 'Australia/Hobart', +< 'Australia/LHI', +< 'Australia/Lindeman', +< 'Australia/Lord_Howe', +< 'Australia/Melbourne', +< 'Australia/NSW', +< 'Australia/North', +< 'Australia/Perth', +< 'Australia/Queensland', +< 'Australia/South', +< 'Australia/Sydney', +< 'Australia/Tasmania', +< 'Australia/Victoria', +< 'Australia/West', +< 'Australia/Yancowinna', +< 'Brazil/Acre', +< 'Brazil/DeNoronha', +< 'Brazil/East', +< 'Brazil/West', +< 'CET', +< 'CST6CDT', +< 'Canada/Atlantic', +< 'Canada/Central', +< 'Canada/Eastern', +< 'Canada/Mountain', +< 'Canada/Newfoundland', +< 'Canada/Pacific', +< 'Canada/Saskatchewan', +< 'Canada/Yukon', +< 'Chile/Continental', +< 'Chile/EasterIsland', +< 'Cuba', +< 'EET', +< 'EST', +< 'EST5EDT', +< 'Egypt', +< 'Eire', +< 'Etc/GMT', +< 'Etc/GMT+0', +< 'Etc/GMT+1', +< 'Etc/GMT+10', +< 'Etc/GMT+11', +< 'Etc/GMT+12', +< 'Etc/GMT+2', +< 'Etc/GMT+3', +< 'Etc/GMT+4', +< 'Etc/GMT+5', +< 'Etc/GMT+6', +< 'Etc/GMT+7', +< 'Etc/GMT+8', +< 'Etc/GMT+9', +< 'Etc/GMT-0', +< 'Etc/GMT-1', +< 'Etc/GMT-10', +< 'Etc/GMT-11', +< 'Etc/GMT-12', +< 'Etc/GMT-13', +< 'Etc/GMT-14', +< 'Etc/GMT-2', +< 'Etc/GMT-3', +< 'Etc/GMT-4', +< 'Etc/GMT-5', +< 'Etc/GMT-6', +< 'Etc/GMT-7', +< 'Etc/GMT-8', +< 'Etc/GMT-9', +< 'Etc/GMT0', +< 'Etc/Greenwich', +< 'Etc/UCT', +< 'Etc/UTC', +< 'Etc/Universal', +< 'Etc/Zulu', +< 'Europe/Amsterdam', +< 'Europe/Andorra', +< 'Europe/Astrakhan', +< 'Europe/Athens', +< 'Europe/Belfast', +< 'Europe/Belgrade', +< 'Europe/Berlin', +< 'Europe/Bratislava', +< 'Europe/Brussels', +< 'Europe/Bucharest', +< 'Europe/Budapest', +< 'Europe/Busingen', +< 'Europe/Chisinau', +< 'Europe/Copenhagen', +< 'Europe/Dublin', +< 'Europe/Gibraltar', +< 'Europe/Guernsey', +< 'Europe/Helsinki', +< 'Europe/Isle_of_Man', +< 'Europe/Istanbul', +< 'Europe/Jersey', +< 'Europe/Kaliningrad', +< 'Europe/Kiev', +< 'Europe/Kirov', +< 'Europe/Kyiv', +< 'Europe/Lisbon', +< 'Europe/Ljubljana', +< 'Europe/London', +< 'Europe/Luxembourg', +< 'Europe/Madrid', +< 'Europe/Malta', +< 'Europe/Mariehamn', +< 'Europe/Minsk', +< 'Europe/Monaco', +< 'Europe/Moscow', +< 'Europe/Nicosia', +< 'Europe/Oslo', +< 'Europe/Paris', +< 'Europe/Podgorica', +< 'Europe/Prague', +< 'Europe/Riga', +< 'Europe/Rome', +< 'Europe/Samara', +< 'Europe/San_Marino', +< 'Europe/Sarajevo', +< 'Europe/Saratov', +< 'Europe/Simferopol', +< 'Europe/Skopje', +< 'Europe/Sofia', +< 'Europe/Stockholm', +< 'Europe/Tallinn', +< 'Europe/Tirane', +< 'Europe/Tiraspol', +< 'Europe/Ulyanovsk', +< 'Europe/Uzhgorod', +< 'Europe/Vaduz', +< 'Europe/Vatican', +< 'Europe/Vienna', +< 'Europe/Vilnius', +< 'Europe/Volgograd', +< 'Europe/Warsaw', +< 'Europe/Zagreb', +< 'Europe/Zaporozhye', +< 'Europe/Zurich', +< 'GB', +< 'GB-Eire', +< 'GMT', +< 'GMT+0', +< 'GMT-0', +< 'GMT0', +< 'Greenwich', +< 'HST', +< 'Hongkong', +< 'Iceland', +< 'Indian/Antananarivo', +< 'Indian/Chagos', +< 'Indian/Christmas', +< 'Indian/Cocos', +< 'Indian/Comoro', +< 'Indian/Kerguelen', +< 'Indian/Mahe', +< 'Indian/Maldives', +< 'Indian/Mauritius', +< 'Indian/Mayotte', +< 'Indian/Reunion', +< 'Iran', +< 'Israel', +< 'Jamaica', +< 'Japan', +< 'Kwajalein', +< 'Libya', +< 'MET', +< 'MST', +< 'MST7MDT', +< 'Mexico/BajaNorte', +< 'Mexico/BajaSur', +< 'Mexico/General', +< 'NZ', +< 'NZ-CHAT', +< 'Navajo', +< 'PRC', +< 'PST8PDT', +< 'Pacific/Apia', +< 'Pacific/Auckland', +< 'Pacific/Bougainville', +< 'Pacific/Chatham', +< 'Pacific/Chuuk', +< 'Pacific/Easter', +< 'Pacific/Efate', +< 'Pacific/Enderbury', +< 'Pacific/Fakaofo', +< 'Pacific/Fiji', +< 'Pacific/Funafuti', +< 'Pacific/Galapagos', +< 'Pacific/Gambier', +< 'Pacific/Guadalcanal', +< 'Pacific/Guam', +< 'Pacific/Honolulu', +< 'Pacific/Johnston', +< 'Pacific/Kanton', +< 'Pacific/Kiritimati', +< 'Pacific/Kosrae', +< 'Pacific/Kwajalein', +< 'Pacific/Majuro', +< 'Pacific/Marquesas', +< 'Pacific/Midway', +< 'Pacific/Nauru', +< 'Pacific/Niue', +< 'Pacific/Norfolk', +< 'Pacific/Noumea', +< 'Pacific/Pago_Pago', +< 'Pacific/Palau', +< 'Pacific/Pitcairn', +< 'Pacific/Pohnpei', +< 'Pacific/Ponape', +< 'Pacific/Port_Moresby', +< 'Pacific/Rarotonga', +< 'Pacific/Saipan', +< 'Pacific/Samoa', +< 'Pacific/Tahiti', +< 'Pacific/Tarawa', +< 'Pacific/Tongatapu', +< 'Pacific/Truk', +< 'Pacific/Wake', +< 'Pacific/Wallis', +< 'Pacific/Yap', +< 'Poland', +< 'Portugal', +< 'ROC', +< 'ROK', +< 'Singapore', +< 'Turkey', +< 'UCT', +< 'US/Alaska', +< 'US/Aleutian', +< 'US/Arizona', +< 'US/Central', +< 'US/East-Indiana', +< 'US/Eastern', +< 'US/Hawaii', +< 'US/Indiana-Starke', +< 'US/Michigan', +< 'US/Mountain', +< 'US/Pacific', +< 'US/Samoa', +< 'UTC', +< 'Universal', +< 'W-SU', +< 'WET', +< 'Zulu'] +--- +> all_timezones = [] +> for root, dirs, files in os.walk(_tzinfo_dir): +> for exclude in 'posix', 'right': +> if exclude in dirs: +> del dirs[dirs.index(exclude)] +> +> all_timezones.extend(os.path.join(root, tz_file)[len(_tzinfo_dir)+1:] +> for tz_file in files +> if tz_file not in ['leapseconds', 'README', 'Theory'] +> and '.' not in tz_file) +> +1105,1542c520,533 +< common_timezones = \ +< ['Africa/Abidjan', +< 'Africa/Accra', +< 'Africa/Addis_Ababa', +< 'Africa/Algiers', +< 'Africa/Asmara', +< 'Africa/Bamako', +< 'Africa/Bangui', +< 'Africa/Banjul', +< 'Africa/Bissau', +< 'Africa/Blantyre', +< 'Africa/Brazzaville', +< 'Africa/Bujumbura', +< 'Africa/Cairo', +< 'Africa/Casablanca', +< 'Africa/Ceuta', +< 'Africa/Conakry', +< 'Africa/Dakar', +< 'Africa/Dar_es_Salaam', +< 'Africa/Djibouti', +< 'Africa/Douala', +< 'Africa/El_Aaiun', +< 'Africa/Freetown', +< 'Africa/Gaborone', +< 'Africa/Harare', +< 'Africa/Johannesburg', +< 'Africa/Juba', +< 'Africa/Kampala', +< 'Africa/Khartoum', +< 'Africa/Kigali', +< 'Africa/Kinshasa', +< 'Africa/Lagos', +< 'Africa/Libreville', +< 'Africa/Lome', +< 'Africa/Luanda', +< 'Africa/Lubumbashi', +< 'Africa/Lusaka', +< 'Africa/Malabo', +< 'Africa/Maputo', +< 'Africa/Maseru', +< 'Africa/Mbabane', +< 'Africa/Mogadishu', +< 'Africa/Monrovia', +< 'Africa/Nairobi', +< 'Africa/Ndjamena', +< 'Africa/Niamey', +< 'Africa/Nouakchott', +< 'Africa/Ouagadougou', +< 'Africa/Porto-Novo', +< 'Africa/Sao_Tome', +< 'Africa/Tripoli', +< 'Africa/Tunis', +< 'Africa/Windhoek', +< 'America/Adak', +< 'America/Anchorage', +< 'America/Anguilla', +< 'America/Antigua', +< 'America/Araguaina', +< 'America/Argentina/Buenos_Aires', +< 'America/Argentina/Catamarca', +< 'America/Argentina/Cordoba', +< 'America/Argentina/Jujuy', +< 'America/Argentina/La_Rioja', +< 'America/Argentina/Mendoza', +< 'America/Argentina/Rio_Gallegos', +< 'America/Argentina/Salta', +< 'America/Argentina/San_Juan', +< 'America/Argentina/San_Luis', +< 'America/Argentina/Tucuman', +< 'America/Argentina/Ushuaia', +< 'America/Aruba', +< 'America/Asuncion', +< 'America/Atikokan', +< 'America/Bahia', +< 'America/Bahia_Banderas', +< 'America/Barbados', +< 'America/Belem', +< 'America/Belize', +< 'America/Blanc-Sablon', +< 'America/Boa_Vista', +< 'America/Bogota', +< 'America/Boise', +< 'America/Cambridge_Bay', +< 'America/Campo_Grande', +< 'America/Cancun', +< 'America/Caracas', +< 'America/Cayenne', +< 'America/Cayman', +< 'America/Chicago', +< 'America/Chihuahua', +< 'America/Costa_Rica', +< 'America/Creston', +< 'America/Cuiaba', +< 'America/Curacao', +< 'America/Danmarkshavn', +< 'America/Dawson', +< 'America/Dawson_Creek', +< 'America/Denver', +< 'America/Detroit', +< 'America/Dominica', +< 'America/Edmonton', +< 'America/Eirunepe', +< 'America/El_Salvador', +< 'America/Fort_Nelson', +< 'America/Fortaleza', +< 'America/Glace_Bay', +< 'America/Goose_Bay', +< 'America/Grand_Turk', +< 'America/Grenada', +< 'America/Guadeloupe', +< 'America/Guatemala', +< 'America/Guayaquil', +< 'America/Guyana', +< 'America/Halifax', +< 'America/Havana', +< 'America/Hermosillo', +< 'America/Indiana/Indianapolis', +< 'America/Indiana/Knox', +< 'America/Indiana/Marengo', +< 'America/Indiana/Petersburg', +< 'America/Indiana/Tell_City', +< 'America/Indiana/Vevay', +< 'America/Indiana/Vincennes', +< 'America/Indiana/Winamac', +< 'America/Inuvik', +< 'America/Iqaluit', +< 'America/Jamaica', +< 'America/Juneau', +< 'America/Kentucky/Louisville', +< 'America/Kentucky/Monticello', +< 'America/Kralendijk', +< 'America/La_Paz', +< 'America/Lima', +< 'America/Los_Angeles', +< 'America/Lower_Princes', +< 'America/Maceio', +< 'America/Managua', +< 'America/Manaus', +< 'America/Marigot', +< 'America/Martinique', +< 'America/Matamoros', +< 'America/Mazatlan', +< 'America/Menominee', +< 'America/Merida', +< 'America/Metlakatla', +< 'America/Mexico_City', +< 'America/Miquelon', +< 'America/Moncton', +< 'America/Monterrey', +< 'America/Montevideo', +< 'America/Montserrat', +< 'America/Nassau', +< 'America/New_York', +< 'America/Nipigon', +< 'America/Nome', +< 'America/Noronha', +< 'America/North_Dakota/Beulah', +< 'America/North_Dakota/Center', +< 'America/North_Dakota/New_Salem', +< 'America/Nuuk', +< 'America/Ojinaga', +< 'America/Panama', +< 'America/Pangnirtung', +< 'America/Paramaribo', +< 'America/Phoenix', +< 'America/Port-au-Prince', +< 'America/Port_of_Spain', +< 'America/Porto_Velho', +< 'America/Puerto_Rico', +< 'America/Punta_Arenas', +< 'America/Rainy_River', +< 'America/Rankin_Inlet', +< 'America/Recife', +< 'America/Regina', +< 'America/Resolute', +< 'America/Rio_Branco', +< 'America/Santarem', +< 'America/Santiago', +< 'America/Santo_Domingo', +< 'America/Sao_Paulo', +< 'America/Scoresbysund', +< 'America/Sitka', +< 'America/St_Barthelemy', +< 'America/St_Johns', +< 'America/St_Kitts', +< 'America/St_Lucia', +< 'America/St_Thomas', +< 'America/St_Vincent', +< 'America/Swift_Current', +< 'America/Tegucigalpa', +< 'America/Thule', +< 'America/Thunder_Bay', +< 'America/Tijuana', +< 'America/Toronto', +< 'America/Tortola', +< 'America/Vancouver', +< 'America/Whitehorse', +< 'America/Winnipeg', +< 'America/Yakutat', +< 'America/Yellowknife', +< 'Antarctica/Casey', +< 'Antarctica/Davis', +< 'Antarctica/DumontDUrville', +< 'Antarctica/Macquarie', +< 'Antarctica/Mawson', +< 'Antarctica/McMurdo', +< 'Antarctica/Palmer', +< 'Antarctica/Rothera', +< 'Antarctica/Syowa', +< 'Antarctica/Troll', +< 'Antarctica/Vostok', +< 'Arctic/Longyearbyen', +< 'Asia/Aden', +< 'Asia/Almaty', +< 'Asia/Amman', +< 'Asia/Anadyr', +< 'Asia/Aqtau', +< 'Asia/Aqtobe', +< 'Asia/Ashgabat', +< 'Asia/Atyrau', +< 'Asia/Baghdad', +< 'Asia/Bahrain', +< 'Asia/Baku', +< 'Asia/Bangkok', +< 'Asia/Barnaul', +< 'Asia/Beirut', +< 'Asia/Bishkek', +< 'Asia/Brunei', +< 'Asia/Chita', +< 'Asia/Choibalsan', +< 'Asia/Colombo', +< 'Asia/Damascus', +< 'Asia/Dhaka', +< 'Asia/Dili', +< 'Asia/Dubai', +< 'Asia/Dushanbe', +< 'Asia/Famagusta', +< 'Asia/Gaza', +< 'Asia/Hebron', +< 'Asia/Ho_Chi_Minh', +< 'Asia/Hong_Kong', +< 'Asia/Hovd', +< 'Asia/Irkutsk', +< 'Asia/Jakarta', +< 'Asia/Jayapura', +< 'Asia/Jerusalem', +< 'Asia/Kabul', +< 'Asia/Kamchatka', +< 'Asia/Karachi', +< 'Asia/Kathmandu', +< 'Asia/Khandyga', +< 'Asia/Kolkata', +< 'Asia/Krasnoyarsk', +< 'Asia/Kuala_Lumpur', +< 'Asia/Kuching', +< 'Asia/Kuwait', +< 'Asia/Macau', +< 'Asia/Magadan', +< 'Asia/Makassar', +< 'Asia/Manila', +< 'Asia/Muscat', +< 'Asia/Nicosia', +< 'Asia/Novokuznetsk', +< 'Asia/Novosibirsk', +< 'Asia/Omsk', +< 'Asia/Oral', +< 'Asia/Phnom_Penh', +< 'Asia/Pontianak', +< 'Asia/Pyongyang', +< 'Asia/Qatar', +< 'Asia/Qostanay', +< 'Asia/Qyzylorda', +< 'Asia/Riyadh', +< 'Asia/Sakhalin', +< 'Asia/Samarkand', +< 'Asia/Seoul', +< 'Asia/Shanghai', +< 'Asia/Singapore', +< 'Asia/Srednekolymsk', +< 'Asia/Taipei', +< 'Asia/Tashkent', +< 'Asia/Tbilisi', +< 'Asia/Tehran', +< 'Asia/Thimphu', +< 'Asia/Tokyo', +< 'Asia/Tomsk', +< 'Asia/Ulaanbaatar', +< 'Asia/Urumqi', +< 'Asia/Ust-Nera', +< 'Asia/Vientiane', +< 'Asia/Vladivostok', +< 'Asia/Yakutsk', +< 'Asia/Yangon', +< 'Asia/Yekaterinburg', +< 'Asia/Yerevan', +< 'Atlantic/Azores', +< 'Atlantic/Bermuda', +< 'Atlantic/Canary', +< 'Atlantic/Cape_Verde', +< 'Atlantic/Faroe', +< 'Atlantic/Madeira', +< 'Atlantic/Reykjavik', +< 'Atlantic/South_Georgia', +< 'Atlantic/St_Helena', +< 'Atlantic/Stanley', +< 'Australia/Adelaide', +< 'Australia/Brisbane', +< 'Australia/Broken_Hill', +< 'Australia/Darwin', +< 'Australia/Eucla', +< 'Australia/Hobart', +< 'Australia/Lindeman', +< 'Australia/Lord_Howe', +< 'Australia/Melbourne', +< 'Australia/Perth', +< 'Australia/Sydney', +< 'Canada/Atlantic', +< 'Canada/Central', +< 'Canada/Eastern', +< 'Canada/Mountain', +< 'Canada/Newfoundland', +< 'Canada/Pacific', +< 'Europe/Amsterdam', +< 'Europe/Andorra', +< 'Europe/Astrakhan', +< 'Europe/Athens', +< 'Europe/Belgrade', +< 'Europe/Berlin', +< 'Europe/Bratislava', +< 'Europe/Brussels', +< 'Europe/Bucharest', +< 'Europe/Budapest', +< 'Europe/Busingen', +< 'Europe/Chisinau', +< 'Europe/Copenhagen', +< 'Europe/Dublin', +< 'Europe/Gibraltar', +< 'Europe/Guernsey', +< 'Europe/Helsinki', +< 'Europe/Isle_of_Man', +< 'Europe/Istanbul', +< 'Europe/Jersey', +< 'Europe/Kaliningrad', +< 'Europe/Kirov', +< 'Europe/Kyiv', +< 'Europe/Lisbon', +< 'Europe/Ljubljana', +< 'Europe/London', +< 'Europe/Luxembourg', +< 'Europe/Madrid', +< 'Europe/Malta', +< 'Europe/Mariehamn', +< 'Europe/Minsk', +< 'Europe/Monaco', +< 'Europe/Moscow', +< 'Europe/Oslo', +< 'Europe/Paris', +< 'Europe/Podgorica', +< 'Europe/Prague', +< 'Europe/Riga', +< 'Europe/Rome', +< 'Europe/Samara', +< 'Europe/San_Marino', +< 'Europe/Sarajevo', +< 'Europe/Saratov', +< 'Europe/Simferopol', +< 'Europe/Skopje', +< 'Europe/Sofia', +< 'Europe/Stockholm', +< 'Europe/Tallinn', +< 'Europe/Tirane', +< 'Europe/Ulyanovsk', +< 'Europe/Vaduz', +< 'Europe/Vatican', +< 'Europe/Vienna', +< 'Europe/Vilnius', +< 'Europe/Volgograd', +< 'Europe/Warsaw', +< 'Europe/Zagreb', +< 'Europe/Zurich', +< 'GMT', +< 'Indian/Antananarivo', +< 'Indian/Chagos', +< 'Indian/Christmas', +< 'Indian/Cocos', +< 'Indian/Comoro', +< 'Indian/Kerguelen', +< 'Indian/Mahe', +< 'Indian/Maldives', +< 'Indian/Mauritius', +< 'Indian/Mayotte', +< 'Indian/Reunion', +< 'Pacific/Apia', +< 'Pacific/Auckland', +< 'Pacific/Bougainville', +< 'Pacific/Chatham', +< 'Pacific/Chuuk', +< 'Pacific/Easter', +< 'Pacific/Efate', +< 'Pacific/Fakaofo', +< 'Pacific/Fiji', +< 'Pacific/Funafuti', +< 'Pacific/Galapagos', +< 'Pacific/Gambier', +< 'Pacific/Guadalcanal', +< 'Pacific/Guam', +< 'Pacific/Honolulu', +< 'Pacific/Kanton', +< 'Pacific/Kiritimati', +< 'Pacific/Kosrae', +< 'Pacific/Kwajalein', +< 'Pacific/Majuro', +< 'Pacific/Marquesas', +< 'Pacific/Midway', +< 'Pacific/Nauru', +< 'Pacific/Niue', +< 'Pacific/Norfolk', +< 'Pacific/Noumea', +< 'Pacific/Pago_Pago', +< 'Pacific/Palau', +< 'Pacific/Pitcairn', +< 'Pacific/Pohnpei', +< 'Pacific/Port_Moresby', +< 'Pacific/Rarotonga', +< 'Pacific/Saipan', +< 'Pacific/Tahiti', +< 'Pacific/Tarawa', +< 'Pacific/Tongatapu', +< 'Pacific/Wake', +< 'Pacific/Wallis', +< 'US/Alaska', +< 'US/Arizona', +< 'US/Central', +< 'US/Eastern', +< 'US/Hawaii', +< 'US/Mountain', +< 'US/Pacific', +< 'UTC'] +--- +> with open(os.path.join(_tzinfo_dir, 'zone.tab')) as zonetab: +> common_timezones = [l.split()[2] +> for l in zonetab +> if l != '' and l[0] != '#'] +> common_timezones.extend( +> ['GMT', +> 'US/Alaska', +> 'US/Arizona', +> 'US/Central', +> 'US/Eastern', +> 'US/Hawaii', +> 'US/Mountain', +> 'US/Pacific', +> 'UTC']) diff --git a/SOURCES/remove_tzinfo_test.patch b/SOURCES/remove_tzinfo_test.patch index 6cae9be..226b97a 100644 --- a/SOURCES/remove_tzinfo_test.patch +++ b/SOURCES/remove_tzinfo_test.patch @@ -1,10 +1,12 @@ +diff --git a/pytz/tests/test_tzinfo.py b/pytz/tests/test_tzinfo.py +index b2640a8..4f5322b 100644 --- a/pytz/tests/test_tzinfo.py +++ b/pytz/tests/test_tzinfo.py -@@ -146,6 +146,7 @@ class PicklingTest(unittest.TestCase): +@@ -155,6 +155,7 @@ class PicklingTest(unittest.TestCase): self._roundtrip_tzinfo(localized_tz) self._roundtrip_datetime(dt.replace(tzinfo=localized_tz)) + @unittest.skip('Fails with system-wide timezone database') def testRoundtrip(self): - dt = datetime(2004, 2, 1, 0, 0, 0) for zone in pytz.all_timezones: + tz = pytz.timezone(zone) diff --git a/SPECS/pytz.spec b/SPECS/pytz.spec index e7e1494..bf3b240 100644 --- a/SPECS/pytz.spec +++ b/SPECS/pytz.spec @@ -1,35 +1,21 @@ -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_python3 1 -%else -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%endif - -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif +# Allow build without test +%bcond_without tests Name: pytz -Version: 2017.2 -Release: 9%{?dist} +Version: 2024.1 +Release: 3%{?dist} Summary: World Timezone Definitions for Python -Group: Development/Languages License: MIT URL: http://pytz.sourceforge.net/ -Source0: https://pypi.io/packages/source/p/%{name}/%{name}-%{version}.zip +Source: %pypi_source # Patch to use the system supplied zoneinfo files -Patch0: pytz-zoneinfo.patch +Patch: pytz-zoneinfo.patch # https://bugzilla.redhat.com/1497572 -Patch1: remove_tzinfo_test.patch +Patch: remove_tzinfo_test.patch BuildArch: noarch -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-pytest -%endif # with python2 +BuildRequires: tzdata %global _description\ pytz brings the Olson tz database into Python. This library allows accurate\ @@ -42,95 +28,190 @@ Almost all (over 540) of the Olson timezones are supported. %description %_description -%if %{with python2} -%package -n python2-%{name} -Summary: %summary -Requires: tzdata -%{?python_provide:%python_provide python2-%{name}} -# Remove before F30 -Provides: pytz%{?_isa} = %{version}-%{release} -Obsoletes: pytz < %{version}-%{release} - -%description -n python2-%{name} %_description -%endif # with python2 -%if 0%{?with_python3} %package -n python3-%{name} -Summary: World Timezone Definitions for Python -Group: Development/Languages -BuildArch: noarch +Summary: %summary BuildRequires: python3-devel +BuildRequires: python3-setuptools +%if %{with tests} BuildRequires: python3-pytest +%endif Requires: tzdata -%description -n python3-%{name} -pytz brings the Olson tz database into Python. This library allows accurate -and cross platform timezone calculations using Python 2.3 or higher. It -also solves the issue of ambiguous times at the end of daylight savings, -which you can read more about in the Python Library Reference -(datetime.tzinfo). +%description -n python3-%{name} %_description -Almost all (over 540) of the Olson timezones are supported. -%endif %prep -%setup -q -%patch0 -p1 -b .zoneinfo -%patch1 -p1 -b .removeTest +%autosetup -p1 %build -%if %{with python2} -%py2_build -%endif # with python2 -%if 0%{?with_python3} %py3_build -%endif # with_python3 %install -%if %{with python2} -%py2_install -chmod +x %{buildroot}%{python2_sitelib}/pytz/*.py -rm -r %{buildroot}%{python2_sitelib}/pytz/zoneinfo -pathfix.py -pn -i %{__python2} %{buildroot}%{python2_sitelib} -%endif # with python2 - -%if 0%{?with_python3} %py3_install rm -r %{buildroot}%{python3_sitelib}/pytz/zoneinfo -pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitelib} -%endif # with_python3 +%if %{with tests} %check -%if %{with python2} -PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v -%endif # with python2 -%if 0%{?with_python3} -PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v +%pytest -v %endif -%if %{with python2} -%files -n python2-%{name} -%license LICENSE.txt -%doc CHANGES.txt README.txt -%{python2_sitelib}/pytz/ -%{python2_sitelib}/*.egg-info -%endif # with python2 -%if 0%{?with_python3} %files -n python3-pytz %license LICENSE.txt -%doc CHANGES.txt README.txt +%doc README.rst %{python3_sitelib}/pytz/ -%{python3_sitelib}/*.egg-info -%endif # with_python3 +%{python3_sitelib}/*.egg-info/ %changelog -* Fri Jun 22 2018 Charalampos Stratakis - 2017.2-9 -- Conditionalize the python2 subpackage +* Fri Jul 19 2024 Fedora Release Engineering - 2024.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 2024.1-2 +- Rebuilt for Python 3.13 + +* Fri Feb 02 2024 Gwyn Ciesla - 2024.1-1 +- 2024.1 + +* Mon Jan 29 2024 Gwyn Ciesla - 2023.4-1 +- 2023.4 + +* Fri Jan 26 2024 Fedora Release Engineering - 2023.3.post1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2023.3.post1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Sep 05 2023 Gwyn Ciesla - 2023.3.post1-1 +- 2023.3.post1 + +* Fri Jul 21 2023 Fedora Release Engineering - 2023.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 2023.3-2 +- Rebuilt for Python 3.12 + +* Wed Mar 29 2023 Gwyn Ciesla - 2023.3-1 +- 2023.3 + +* Mon Mar 27 2023 Gwyn Ciesla - 2023.2-1 +- 2023.2 + +* Wed Mar 08 2023 Gwyn Ciesla - 2022.7.1-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 2022.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Gwyn Ciesla - 2022.7.1-1 +- 2022.7.1 + +* Mon Dec 19 2022 Gwyn Ciesla - 2022.7-1 +- 2022.7 + +* Thu Nov 10 2022 Miro Hrončok - 2022.6-2 +- Run tests during build + +* Tue Nov 01 2022 Gwyn Ciesla - 2022.6-1 +- 2022.6 + +* Tue Oct 18 2022 Gwyn Ciesla - 2022.5-1 +- 2022.5 + +* Mon Oct 03 2022 Gwyn Ciesla - 2022.4-1 +- 2022.4 + +* Fri Aug 12 2022 Gwyn Ciesla - 2022.2-1 +- 2022.2 + +* Fri Jul 22 2022 Fedora Release Engineering - 2022.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 2022.1-2 +- Rebuilt for Python 3.11 + +* Mon Mar 21 2022 Gwyn Ciesla - 2022.1-1 +- 2022.1 + +* Fri Jan 21 2022 Fedora Release Engineering - 2021.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Oct 04 2021 Gwyn Ciesla - 2021.3-1 +- 2021.3 + +* Fri Jul 23 2021 Fedora Release Engineering - 2021.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 02 2021 Python Maint - 2021.1-3 +- Rebuilt for Python 3.10 + +* Tue Mar 16 2021 Miro Hrončok - 2021.1-2 +- Always close the zone.tab file + +* Mon Feb 01 2021 Gwyn Ciesla - 2021.1-1 +- 2021.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 2020.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 24 2020 Gwyn Ciesla - 2020.5-1 +- 2020.5 + +* Mon Dec 21 2020 Miro Hrončok - 2020.4-3 +- Disable Python 2 in Fedora 34+ + +* Wed Nov 25 2020 Miro Hrončok - 2020.4-2 +- Disable Python 2 in ELN + +* Mon Nov 02 2020 Gwyn Ciesla - 2020.4-1 +- 2020.4 + +* Wed Jul 29 2020 Fedora Release Engineering - 2020.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 22 2020 Miro Hrončok - 2020.1-2 +- Rebuilt for Python 3.9 + +* Tue Apr 28 2020 Gwyn Ciesla - 2020.1-1 +- 2020.1 + +* Thu Jan 30 2020 Fedora Release Engineering - 2019.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Oct 07 2019 Gwyn Ciesla - 2019.3-1 +- 2019.3 + +* Thu Oct 03 2019 Miro Hrončok - 2019.2-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 15 2019 Miro Hrončok - 2019.2-2 +- Rebuilt for Python 3.8 + +* Wed Jul 31 2019 Gwyn Ciesla - 2019.2-1 +- 2019.2 + +* Fri Jul 26 2019 Gwyn Ciesla - 2019.1-1 +- 2019.1 + +* Tue Mar 12 2019 Miro Hrončok - 2018.9-1 +- Update to 2018.9 +- Remove leapseconds from pytz.all_timezones (#1642003) + +* Sat Feb 02 2019 Fedora Release Engineering - 2018.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Aug 23 2018 Miro Hrončok - 2018.5-1 +- Update to 2018.5 (#1508227) + +* Sat Jul 14 2018 Fedora Release Engineering - 2017.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 14 2018 Miro Hrončok - 2017.2-9 +- Rebuilt for Python 3.7 * Wed May 23 2018 Miro Hrončok - 2017.2-8 - Fix ambiguous shebangs