diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5913d1f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/pytz-2017.2.zip diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pytz-zoneinfo.patch b/pytz-zoneinfo.patch new file mode 100644 index 0000000..9f17615 --- /dev/null +++ b/pytz-zoneinfo.patch @@ -0,0 +1,1103 @@ +diff --git a/pytz/__init__.py b/pytz/__init__.py +index 13c83b1..e8a674f 100644 +--- a/pytz/__init__.py ++++ b/pytz/__init__.py +@@ -70,6 +70,9 @@ else: # Python 2.x + """ + return s.encode('ASCII') + ++_tzinfo_dir = os.getenv("TZDIR") 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): + 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): +- # 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) + 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) + diff --git a/pytz.spec b/pytz.spec new file mode 100644 index 0000000..e7e1494 --- /dev/null +++ b/pytz.spec @@ -0,0 +1,295 @@ +%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 + +Name: pytz +Version: 2017.2 +Release: 9%{?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 +# Patch to use the system supplied zoneinfo files +Patch0: pytz-zoneinfo.patch +# https://bugzilla.redhat.com/1497572 +Patch1: remove_tzinfo_test.patch + +BuildArch: noarch +%if %{with python2} +BuildRequires: python2-devel +BuildRequires: python2-pytest +%endif # with python2 + +%global _description\ +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).\ +\ +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 +BuildRequires: python3-devel +BuildRequires: python3-pytest +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). + +Almost all (over 540) of the Olson timezones are supported. +%endif + +%prep +%setup -q +%patch0 -p1 -b .zoneinfo +%patch1 -p1 -b .removeTest + + +%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 + + +%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 +%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 +%{python3_sitelib}/pytz/ +%{python3_sitelib}/*.egg-info +%endif # with_python3 + + +%changelog +* Fri Jun 22 2018 Charalampos Stratakis - 2017.2-9 +- Conditionalize the python2 subpackage + +* Wed May 23 2018 Miro Hrončok - 2017.2-8 +- Fix ambiguous shebangs + +* Sat Mar 17 2018 Matěj Cepl - 2017.2-7 +- Switch __python for __python2 macro. + +* Sat Mar 17 2018 Matěj Cepl - 2017.2-6 +- remove test_tzinfo.PicklingTest.testRoundtrip which fails with our + system-wide timezone database (#1497572) + +* Fri Feb 09 2018 Fedora Release Engineering - 2017.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Sep 27 2017 Troy Dawson - 2017.2-4 +- Cleanup spec file conditionals + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2017.2-3 +- Python 2 binary package renamed to python2-pytz + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 2017.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jul 17 2017 Petr Šabata - 2017.2-1 +- Update to 2017.2 + +* Sat Feb 11 2017 Fedora Release Engineering - 2016.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Dec 13 2016 Charalampos Stratakis - 2016.10-3 +- Enable tests + +* Fri Dec 09 2016 Charalampos Stratakis - 2016.10-2 +- Rebuild for Python 3.6 +- Disable python3 tests for now + +* Tue Dec 6 2016 Orion Poplawski - 2016.10-1 +- Update to 2016.10 + +* Tue Nov 8 2016 Orion Poplawski - 2016.7-1 +- Update to 2016.7 + +* Thu Jul 21 2016 Matěj Cepl - 2016.6.1-1 +- Update to 2016.6.1 (RHBZ #1356337) +- Fix Source0 URL to override a change in PyPI URLs (see + https://bitbucket.org/pypa/pypi/issues/438/) + +* Tue Jul 19 2016 Fedora Release Engineering - 2016.4-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon May 16 2016 Orion Poplawski 2016.4-1 +- Use proper PYTHONPATH with python3 test +- Use %%license +- Drop BuildRoot and %%clean + +* Sat Apr 23 2016 Matěj Cepl 2016.4-1 +- Update to 2016.4 (RHBZ #1265036) + +* Thu Feb 04 2016 Fedora Release Engineering - 2015.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 03 2015 Robert Kuska - 2015.7-2 +- Rebuilt for Python3.5 rebuild + +* Mon Oct 26 2015 Orion Poplawski - 2015.7-1 +- Update to 2015.7 + +* Sun Aug 30 2015 Orion Poplawski - 2015.4-1 +- Update to 2015.4 (bug #1161236) +- Do not ship zoneinfo with python3 package (bug #1251554) +- Run tests + +* Thu Jun 18 2015 Fedora Release Engineering - 2012d-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2012d-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 14 2014 Bohuslav Kabrda - 2012d-6 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Sun Aug 04 2013 Fedora Release Engineering - 2012d-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2012d-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 3 2013 David Malcolm - 2012d-3 +- remove rhel logic from with_python3 conditional + +* Fri Sep 14 2012 Jon Ciesla - 2012d-2 +- Use system zoneinfo, BZ 857266. + +* Thu Aug 23 2012 Jon Ciesla - 2012d-1 +- Latest upstream, python3 support, BZ 851226. + +* Sat Jul 21 2012 Fedora Release Engineering - 2010h-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2010h-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 2010h-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jul 22 2010 David Malcolm - 2010h-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Mon Jun 28 2010 Toshio Kuratomi - 2010h-2 +- Define => global + +* Tue Apr 27 2010 Jon Ciesla - 2010h-1 +- Update to current version, BZ 573252. + +* Mon Feb 01 2010 Jon Ciesla - 2009i-7 +- Corrected Source0 URL, BZ 560168. + +* Sun Jul 26 2009 Fedora Release Engineering - 2008i-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 2008i-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2008i-4 +- Rebuild for Python 2.6 + +* Tue Nov 18 2008 Jef Spaleta 2008i-3 +- Apply patch correctly. + +* Thu Nov 13 2008 Jef Spaleta 2008i-2 +- Updated tzdata patch from Petr Machata bug 471014 + +* Tue Nov 11 2008 Jef Spaleta 2008i-1 +- Update to latest, now using timezone files provided by tzdata package + +* Fri Jan 04 2008 Jef Spaleta 2006p-3 +- Fix for egg-info file creation + +* Mon Dec 11 2006 Jef Spaleta 2006p-2 +- Bump for rebuild against python 2.5 and change BR to python-devel accordingly + +* Fri Dec 8 2006 Orion Poplawski 2006p-1 +- Update to 2006p + +* Thu Sep 7 2006 Orion Poplawski 2006g-1 +- Update to 2006g + +* Mon Feb 13 2006 Orion Poplawski 2005r-2 +- Rebuild for gcc/glibc changes + +* Tue Jan 3 2006 Orion Poplawski 2005r-1 +- Update to 2005r + +* Thu Dec 22 2005 Orion Poplawski 2005m-1 +- Update to 2005m + +* Fri Jul 22 2005 Orion Poplawski 2005i-2 +- Remove -O1 from install command + +* Tue Jul 05 2005 Orion Poplawski 2005i-1 +- Initial Fedora Extras package diff --git a/remove_tzinfo_test.patch b/remove_tzinfo_test.patch new file mode 100644 index 0000000..6cae9be --- /dev/null +++ b/remove_tzinfo_test.patch @@ -0,0 +1,10 @@ +--- a/pytz/tests/test_tzinfo.py ++++ b/pytz/tests/test_tzinfo.py +@@ -146,6 +146,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: diff --git a/sources b/sources new file mode 100644 index 0000000..5e68458 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (pytz-2017.2.zip) = d67d64a64b4c21e0bd41da56020fc7b016aec9da7f3243f79b65704119f70b8a9cd4f5f905631b6761e06ecef93830e5e479e16c7b1611ac70e0cd2b39d5b916