r1299 - in python-tz/trunk (4 files)
Matthias Klose
doko at alioth.debian.org
Mon Oct 27 09:35:46 UTC 2008
Date: Monday, October 27, 2008 @ 09:35:45
Author: doko
Revision: 1299
python-tz (2008h-1) unstable; urgency=low
* New upstream version.
- Fixes lookup errors with unknown timezones (error setting US/Pacific-New
timezone. LP: #244681).
* debian/copyright: Update copyright year and download location.
* debian/control: Update homepage.
-- Matthias Klose <doko at debian.org> Mon, 27 Oct 2008 07:29:54 +0000
Modified:
python-tz/trunk/debian/changelog
python-tz/trunk/debian/control
python-tz/trunk/debian/copyright
python-tz/trunk/pytz/__init__.py
Modified: python-tz/trunk/debian/changelog
===================================================================
--- python-tz/trunk/debian/changelog 2008-10-27 08:09:17 UTC (rev 1298)
+++ python-tz/trunk/debian/changelog 2008-10-27 09:35:45 UTC (rev 1299)
@@ -1,3 +1,13 @@
+python-tz (2008h-1) unstable; urgency=low
+
+ * New upstream version.
+ - Fixes lookup errors with unknown timezones (error setting US/Pacific-New
+ timezone. LP: #244681).
+ * debian/copyright: Update copyright year and download location.
+ * debian/control: Update homepage.
+
+ -- Matthias Klose <doko at debian.org> Mon, 27 Oct 2008 07:29:54 +0000
+
python-tz (2008c-2) unstable; urgency=low
* Do not use setuptools to build the package (the setup falls back to
Modified: python-tz/trunk/debian/control
===================================================================
--- python-tz/trunk/debian/control 2008-10-27 08:09:17 UTC (rev 1298)
+++ python-tz/trunk/debian/control 2008-10-27 09:35:45 UTC (rev 1299)
@@ -6,8 +6,8 @@
Build-Depends: debhelper (>= 5.0.38)
Build-Depends-Indep: python-all-dev (>= 2.3.5-9), python-central (>= 0.5)
Build-Conflicts: python-setuptools
-Standards-Version: 3.7.3
-Homepage: http://pytz.sourceforge.net/
+Standards-Version: 3.8.0
+Homepage: http://pypi.python.org/pypi/pytz/
XS-Python-Version: all
Package: python-tz
Modified: python-tz/trunk/debian/copyright
===================================================================
--- python-tz/trunk/debian/copyright 2008-10-27 08:09:17 UTC (rev 1298)
+++ python-tz/trunk/debian/copyright 2008-10-27 09:35:45 UTC (rev 1299)
@@ -1,7 +1,7 @@
This package was debianized by Brian Sutherland <jinty at web.de> on
Tue, 8 Feb 2005 02:14:33 +0100.
-It was downloaded from http://sourceforge.net/projects/pytz/.
+It was downloaded from http://pypi.python.org/pypi/pytz/
Copyright:
@@ -39,7 +39,7 @@
And the automatic generation code license is:
-Copyright (c) 2003-2005 Stuart Bishop <stuart at stuartbishop.net>
+Copyright (c) 2003-2008 Stuart Bishop <stuart at stuartbishop.net>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
Modified: python-tz/trunk/pytz/__init__.py
===================================================================
--- python-tz/trunk/pytz/__init__.py 2008-10-27 08:09:17 UTC (rev 1298)
+++ python-tz/trunk/pytz/__init__.py 2008-10-27 09:35:45 UTC (rev 1299)
@@ -9,28 +9,32 @@
'''
# The Olson database has historically been updated about 4 times a year
-OLSON_VERSION = '2008a'
+OLSON_VERSION = '2008h'
VERSION = OLSON_VERSION
+# Version format for a patch release - only one so far.
#VERSION = OLSON_VERSION + '.2'
__version__ = OLSON_VERSION
OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
__all__ = [
- 'timezone', 'utc', 'country_timezones',
- 'AmbiguousTimeError', 'UnknownTimeZoneError',
+ 'timezone', 'utc', 'country_timezones', 'country_names',
+ 'AmbiguousTimeError', 'InvalidTimeError',
+ 'NonExistentTimeError', 'UnknownTimeZoneError',
'all_timezones', 'all_timezones_set',
'common_timezones', 'common_timezones_set',
]
import sys, datetime, os.path, gettext
+from UserDict import DictMixin
try:
from pkg_resources import resource_stream
except ImportError:
resource_stream = None
-from tzinfo import AmbiguousTimeError, unpickler
+from tzinfo import AmbiguousTimeError, InvalidTimeError, NonExistentTimeError
+from tzinfo import unpickler
from tzfile import build_tzinfo
# Use 2.3 sets module implementation if set builtin is not available
@@ -53,6 +57,14 @@
filename = os.path.join('/usr/share/zoneinfo', *name_parts)
return open(filename, 'rb')
+def resource_exists(name):
+ """Return true if the given resource exists"""
+ try:
+ open_resource(name)
+ return True
+ except IOError:
+ return False
+
# Enable this when we get some translations?
# We want an i18n API that is useful to programs using Python's gettext
@@ -237,38 +249,85 @@
return unpickler(*args)
_p.__safe_for_unpickling__ = True
-_country_timezones_cache = {}
-def country_timezones(iso3166_code):
- """Return a list of timezones used in a particular country.
+class _LazyDict(DictMixin):
+ """Dictionary populated on first use."""
+ data = None
+ def __getitem__(self, key):
+ if self.data is None:
+ self._fill()
+ return self.data[key.upper()]
+ def keys(self):
+ if self.data is None:
+ self._fill()
+ return self.data.keys()
+
+
+class _CountryTimezoneDict(_LazyDict):
+ """Map ISO 3166 country code to a list of timezone names commonly used
+ in that country.
+
iso3166_code is the two letter code used to identify the country.
- >>> country_timezones('ch')
+ >>> country_timezones['ch']
['Europe/Zurich']
- >>> country_timezones('CH')
+ >>> country_timezones['CH']
['Europe/Zurich']
- >>> country_timezones(u'ch')
+ >>> country_timezones[u'ch']
['Europe/Zurich']
- >>> country_timezones('XXX')
+ >>> country_timezones['XXX']
Traceback (most recent call last):
...
KeyError: 'XXX'
+
+ Previously, this information was exposed as a function rather than a
+ dictionary. This is still supported::
+
+ >>> country_timezones('nz')
+ ['Pacific/Auckland', 'Pacific/Chatham']
"""
- iso3166_code = iso3166_code.upper()
- if not _country_timezones_cache:
+ def __call__(self, iso3166_code):
+ """Backwards compatibility."""
+ return self[iso3166_code]
+
+ def _fill(self):
+ data = {}
zone_tab = open_resource('zone.tab')
for line in zone_tab:
if line.startswith('#'):
continue
code, coordinates, zone = line.split(None, 4)[:3]
+ if zone not in all_timezones:
+ continue
try:
- _country_timezones_cache[code].append(zone)
+ data[code].append(zone)
except KeyError:
- _country_timezones_cache[code] = [zone]
- return _country_timezones_cache[iso3166_code]
+ data[code] = [zone]
+ self.data = data
+country_timezones = _CountryTimezoneDict()
+
+class _CountryNameDict(_LazyDict):
+ '''Dictionary proving ISO3166 code -> English name.
+
+ >>> country_names['au']
+ 'Australia'
+ '''
+ def _fill(self):
+ data = {}
+ zone_tab = open_resource('iso3166.tab')
+ for line in zone_tab.readlines():
+ if line.startswith('#'):
+ continue
+ code, name = line.split(None, 1)
+ data[code] = name.strip()
+ self.data = data
+
+country_names = _CountryNameDict()
+
+
# Time-zone info based solely on fixed offsets
class _FixedOffset(datetime.tzinfo):
@@ -383,7 +442,7 @@
if __name__ == '__main__':
_test()
-common_timezones = \
+all_timezones = \
['Africa/Abidjan',
'Africa/Accra',
'Africa/Addis_Ababa',
@@ -442,6 +501,18 @@
'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/San_Juan',
+ 'America/Argentina/San_Luis',
+ 'America/Argentina/Tucuman',
+ 'America/Argentina/Ushuaia',
'America/Aruba',
'America/Asuncion',
'America/Atikokan',
@@ -493,12 +564,22 @@
'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/La_Paz',
'America/Lima',
@@ -525,6 +606,8 @@
'America/Nipigon',
'America/Nome',
'America/Noronha',
+ 'America/North_Dakota/Center',
+ 'America/North_Dakota/New_Salem',
'America/Panama',
'America/Pangnirtung',
'America/Paramaribo',
@@ -541,6 +624,7 @@
'America/Resolute',
'America/Rio_Branco',
'America/Rosario',
+ 'America/Santarem',
'America/Santiago',
'America/Santo_Domingo',
'America/Sao_Paulo',
@@ -604,6 +688,7 @@
'Asia/Dushanbe',
'Asia/Gaza',
'Asia/Harbin',
+ 'Asia/Ho_Chi_Minh',
'Asia/Hong_Kong',
'Asia/Hovd',
'Asia/Irkutsk',
@@ -616,6 +701,7 @@
'Asia/Karachi',
'Asia/Kashgar',
'Asia/Katmandu',
+ 'Asia/Kolkata',
'Asia/Krasnoyarsk',
'Asia/Kuala_Lumpur',
'Asia/Kuching',
@@ -699,6 +785,8 @@
'Brazil/DeNoronha',
'Brazil/East',
'Brazil/West',
+ 'CET',
+ 'CST6CDT',
'Canada/Atlantic',
'Canada/Central',
'Canada/East-Saskatchewan',
@@ -710,6 +798,47 @@
'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/Athens',
@@ -768,7 +897,16 @@
'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',
@@ -780,9 +918,23 @@
'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/Chatham',
@@ -823,6 +975,13 @@
'Pacific/Wake',
'Pacific/Wallis',
'Pacific/Yap',
+ 'Poland',
+ 'Portugal',
+ 'ROC',
+ 'ROK',
+ 'Singapore',
+ 'Turkey',
+ 'UCT',
'US/Alaska',
'US/Aleutian',
'US/Arizona',
@@ -836,16 +995,21 @@
'US/Pacific',
'US/Pacific-New',
'US/Samoa',
- 'UTC']
-common_timezones_set = set(common_timezones)
-
-all_timezones = \
+ 'UTC',
+ 'Universal',
+ 'W-SU',
+ 'WET',
+ 'Zulu']
+all_timezones = [
+ tz for tz in all_timezones if resource_exists(tz)]
+
+all_timezones_set = set(all_timezones)
+common_timezones = \
['Africa/Abidjan',
'Africa/Accra',
'Africa/Addis_Ababa',
'Africa/Algiers',
'Africa/Asmara',
- 'Africa/Asmera',
'Africa/Bamako',
'Africa/Bangui',
'Africa/Banjul',
@@ -889,7 +1053,6 @@
'Africa/Ouagadougou',
'Africa/Porto-Novo',
'Africa/Sao_Tome',
- 'Africa/Timbuktu',
'Africa/Tripoli',
'Africa/Tunis',
'Africa/Windhoek',
@@ -900,19 +1063,18 @@
'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/San_Juan',
+ 'America/Argentina/San_Luis',
'America/Argentina/Tucuman',
'America/Argentina/Ushuaia',
'America/Aruba',
'America/Asuncion',
'America/Atikokan',
- 'America/Atka',
'America/Bahia',
'America/Barbados',
'America/Belem',
@@ -921,18 +1083,14 @@
'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/Cuiaba',
'America/Curacao',
@@ -945,8 +1103,6 @@
'America/Edmonton',
'America/Eirunepe',
'America/El_Salvador',
- 'America/Ensenada',
- 'America/Fort_Wayne',
'America/Fortaleza',
'America/Glace_Bay',
'America/Godthab',
@@ -968,26 +1124,20 @@
'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/La_Paz',
'America/Lima',
'America/Los_Angeles',
- 'America/Louisville',
'America/Maceio',
'America/Managua',
'America/Manaus',
- 'America/Marigot',
'America/Martinique',
'America/Mazatlan',
- 'America/Mendoza',
'America/Menominee',
'America/Merida',
'America/Mexico_City',
@@ -1010,7 +1160,6 @@
'America/Phoenix',
'America/Port-au-Prince',
'America/Port_of_Spain',
- 'America/Porto_Acre',
'America/Porto_Velho',
'America/Puerto_Rico',
'America/Rainy_River',
@@ -1019,13 +1168,11 @@
'America/Regina',
'America/Resolute',
'America/Rio_Branco',
- 'America/Rosario',
+ 'America/Santarem',
'America/Santiago',
'America/Santo_Domingo',
'America/Sao_Paulo',
'America/Scoresbysund',
- 'America/Shiprock',
- 'America/St_Barthelemy',
'America/St_Johns',
'America/St_Kitts',
'America/St_Lucia',
@@ -1039,7 +1186,6 @@
'America/Toronto',
'America/Tortola',
'America/Vancouver',
- 'America/Virgin',
'America/Whitehorse',
'America/Winnipeg',
'America/Yakutat',
@@ -1051,10 +1197,8 @@
'Antarctica/McMurdo',
'Antarctica/Palmer',
'Antarctica/Rothera',
- 'Antarctica/South_Pole',
'Antarctica/Syowa',
'Antarctica/Vostok',
- 'Arctic/Longyearbyen',
'Asia/Aden',
'Asia/Almaty',
'Asia/Amman',
@@ -1062,7 +1206,6 @@
'Asia/Aqtau',
'Asia/Aqtobe',
'Asia/Ashgabat',
- 'Asia/Ashkhabad',
'Asia/Baghdad',
'Asia/Bahrain',
'Asia/Baku',
@@ -1070,12 +1213,9 @@
'Asia/Beirut',
'Asia/Bishkek',
'Asia/Brunei',
- 'Asia/Calcutta',
'Asia/Choibalsan',
'Asia/Chongqing',
- 'Asia/Chungking',
'Asia/Colombo',
- 'Asia/Dacca',
'Asia/Damascus',
'Asia/Dhaka',
'Asia/Dili',
@@ -1083,10 +1223,10 @@
'Asia/Dushanbe',
'Asia/Gaza',
'Asia/Harbin',
+ 'Asia/Ho_Chi_Minh',
'Asia/Hong_Kong',
'Asia/Hovd',
'Asia/Irkutsk',
- 'Asia/Istanbul',
'Asia/Jakarta',
'Asia/Jayapura',
'Asia/Jerusalem',
@@ -1095,11 +1235,11 @@
'Asia/Karachi',
'Asia/Kashgar',
'Asia/Katmandu',
+ 'Asia/Kolkata',
'Asia/Krasnoyarsk',
'Asia/Kuala_Lumpur',
'Asia/Kuching',
'Asia/Kuwait',
- 'Asia/Macao',
'Asia/Macau',
'Asia/Magadan',
'Asia/Makassar',
@@ -1116,7 +1256,6 @@
'Asia/Qyzylorda',
'Asia/Rangoon',
'Asia/Riyadh',
- 'Asia/Saigon',
'Asia/Sakhalin',
'Asia/Samarkand',
'Asia/Seoul',
@@ -1126,13 +1265,9 @@
'Asia/Tashkent',
'Asia/Tbilisi',
'Asia/Tehran',
- 'Asia/Tel_Aviv',
- 'Asia/Thimbu',
'Asia/Thimphu',
'Asia/Tokyo',
- 'Asia/Ujung_Pandang',
'Asia/Ulaanbaatar',
- 'Asia/Ulan_Bator',
'Asia/Urumqi',
'Asia/Vientiane',
'Asia/Vladivostok',
@@ -1143,102 +1278,29 @@
'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/Athens',
- 'Europe/Belfast',
'Europe/Belgrade',
'Europe/Berlin',
- 'Europe/Bratislava',
'Europe/Brussels',
'Europe/Bucharest',
'Europe/Budapest',
@@ -1246,60 +1308,38 @@
'Europe/Copenhagen',
'Europe/Dublin',
'Europe/Gibraltar',
- 'Europe/Guernsey',
'Europe/Helsinki',
- 'Europe/Isle_of_Man',
'Europe/Istanbul',
- 'Europe/Jersey',
'Europe/Kaliningrad',
'Europe/Kiev',
'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/Simferopol',
- 'Europe/Skopje',
'Europe/Sofia',
'Europe/Stockholm',
'Europe/Tallinn',
'Europe/Tirane',
- 'Europe/Tiraspol',
'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',
@@ -1311,23 +1351,6 @@
'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/Chatham',
@@ -1360,38 +1383,21 @@
'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',
- 'posixrules']
-all_timezones_set = set(all_timezones)
+ 'UTC']
+common_timezones = [
+ tz for tz in common_timezones if tz in all_timezones]
+
+common_timezones_set = set(common_timezones)
More information about the pkg-zope-commits
mailing list