[Zope3-checkins] SVN: Zope3/trunk/src/pytz/ Update pytz to 2005r

Stuart Bishop stuart at stuartbishop.net
Mon Jan 9 05:04:50 EST 2006


Log message for revision 41238:
  Update pytz to 2005r

Changed:
  U   Zope3/trunk/src/pytz/README.txt
  U   Zope3/trunk/src/pytz/__init__.py
  A   Zope3/trunk/src/pytz/locales/
  A   Zope3/trunk/src/pytz/locales/pytz.pot
  U   Zope3/trunk/src/pytz/tests/test_tzinfo.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Cambridge_Bay.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Glace_Bay.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Halifax.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Havana.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Iqaluit.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Managua.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Miquelon.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Montevideo.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Montreal.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Nipigon.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Pangnirtung.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Rainy_River.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Rankin_Inlet.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Thunder_Bay.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Toronto.py
  U   Zope3/trunk/src/pytz/zoneinfo/America/Winnipeg.py
  U   Zope3/trunk/src/pytz/zoneinfo/Asia/Amman.py
  U   Zope3/trunk/src/pytz/zoneinfo/Asia/Baku.py
  U   Zope3/trunk/src/pytz/zoneinfo/Asia/Bishkek.py
  U   Zope3/trunk/src/pytz/zoneinfo/Asia/Gaza.py
  U   Zope3/trunk/src/pytz/zoneinfo/Asia/Tbilisi.py
  U   Zope3/trunk/src/pytz/zoneinfo/CST6CDT.py
  U   Zope3/trunk/src/pytz/zoneinfo/Canada/Atlantic.py
  U   Zope3/trunk/src/pytz/zoneinfo/Canada/Central.py
  U   Zope3/trunk/src/pytz/zoneinfo/Canada/Eastern.py
  U   Zope3/trunk/src/pytz/zoneinfo/Cuba.py
  U   Zope3/trunk/src/pytz/zoneinfo/EST.py
  U   Zope3/trunk/src/pytz/zoneinfo/EST5EDT.py
  U   Zope3/trunk/src/pytz/zoneinfo/HST.py
  U   Zope3/trunk/src/pytz/zoneinfo/MST.py
  U   Zope3/trunk/src/pytz/zoneinfo/MST7MDT.py
  U   Zope3/trunk/src/pytz/zoneinfo/PST8PDT.py

-=-
Modified: Zope3/trunk/src/pytz/README.txt
===================================================================
--- Zope3/trunk/src/pytz/README.txt	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/README.txt	2006-01-09 10:04:49 UTC (rev 41238)
@@ -202,7 +202,7 @@
 `all_timezones` is the exhaustive list of the timezone names that can be used.
 
 >>> from pytz import all_timezones
->>> len(all_timezones) >= 548
+>>> len(all_timezones) >= 500
 True
 >>> 'Etc/Greenwich' in all_timezones
 True

Modified: Zope3/trunk/src/pytz/__init__.py
===================================================================
--- Zope3/trunk/src/pytz/__init__.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/__init__.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -9,7 +9,7 @@
 '''
 
 # The Olson database has historically been updated about 4 times a year
-OLSON_VERSION = '2005m'
+OLSON_VERSION = '2005r'
 VERSION = OLSON_VERSION
 #VERSION = OLSON_VERSION + '.2'
 __version__ = OLSON_VERSION
@@ -18,12 +18,26 @@
 
 __all__ = [
     'timezone', 'all_timezones', 'common_timezones', 'utc',
-    'AmbiguousTimeError', 'country_timezones',
+    'AmbiguousTimeError', 'country_timezones', '_',
     ]
 
-import sys, datetime, os.path
+import sys, datetime, os.path, gettext
 from tzinfo import AmbiguousTimeError, unpickler
 
+# Enable this when we get some translations?
+# We want an i18n API that is useful to programs using Python's gettext
+# module, as well as the Zope3 i18n package. Perhaps we should just provide
+# the POT file and translations, and leave it up to callers to make use
+# of them.
+# 
+# t = gettext.translation(
+#         'pytz', os.path.join(os.path.dirname(__file__), 'locales'),
+#         fallback=True
+#         )
+# def _(timezone_name):
+#     """Translate a timezone name using the current locale, returning Unicode"""
+#     return t.ugettext(timezone_name)
+
 def timezone(zone):
     ''' Return a datetime.tzinfo implementation for the given timezone 
     
@@ -1262,19 +1276,6 @@
  'ROC',
  'ROK',
  'Singapore',
- 'SystemV/AST4',
- 'SystemV/AST4ADT',
- 'SystemV/CST6',
- 'SystemV/CST6CDT',
- 'SystemV/EST5',
- 'SystemV/EST5EDT',
- 'SystemV/HST10',
- 'SystemV/MST7',
- 'SystemV/MST7MDT',
- 'SystemV/PST8',
- 'SystemV/PST8PDT',
- 'SystemV/YST9',
- 'SystemV/YST9YDT',
  'Turkey',
  'UCT',
  'US/Alaska',

Added: Zope3/trunk/src/pytz/locales/pytz.pot
===================================================================
--- Zope3/trunk/src/pytz/locales/pytz.pot	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/locales/pytz.pot	2006-01-09 10:04:49 UTC (rev 41238)
@@ -0,0 +1,1612 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: pytz 2005r\n"
+"POT-Creation-Date: 2005-12-31 09:29+UTC\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+
+
+msgid "Africa/Abidjan"
+msgstr ""
+
+msgid "Africa/Accra"
+msgstr ""
+
+msgid "Africa/Addis_Ababa"
+msgstr ""
+
+msgid "Africa/Algiers"
+msgstr ""
+
+msgid "Africa/Asmera"
+msgstr ""
+
+msgid "Africa/Bamako"
+msgstr ""
+
+msgid "Africa/Bangui"
+msgstr ""
+
+msgid "Africa/Banjul"
+msgstr ""
+
+msgid "Africa/Bissau"
+msgstr ""
+
+msgid "Africa/Blantyre"
+msgstr ""
+
+msgid "Africa/Brazzaville"
+msgstr ""
+
+msgid "Africa/Bujumbura"
+msgstr ""
+
+msgid "Africa/Cairo"
+msgstr ""
+
+msgid "Africa/Casablanca"
+msgstr ""
+
+msgid "Africa/Ceuta"
+msgstr ""
+
+msgid "Africa/Conakry"
+msgstr ""
+
+msgid "Africa/Dakar"
+msgstr ""
+
+msgid "Africa/Dar_es_Salaam"
+msgstr ""
+
+msgid "Africa/Djibouti"
+msgstr ""
+
+msgid "Africa/Douala"
+msgstr ""
+
+msgid "Africa/El_Aaiun"
+msgstr ""
+
+msgid "Africa/Freetown"
+msgstr ""
+
+msgid "Africa/Gaborone"
+msgstr ""
+
+msgid "Africa/Harare"
+msgstr ""
+
+msgid "Africa/Johannesburg"
+msgstr ""
+
+msgid "Africa/Kampala"
+msgstr ""
+
+msgid "Africa/Khartoum"
+msgstr ""
+
+msgid "Africa/Kigali"
+msgstr ""
+
+msgid "Africa/Kinshasa"
+msgstr ""
+
+msgid "Africa/Lagos"
+msgstr ""
+
+msgid "Africa/Libreville"
+msgstr ""
+
+msgid "Africa/Lome"
+msgstr ""
+
+msgid "Africa/Luanda"
+msgstr ""
+
+msgid "Africa/Lubumbashi"
+msgstr ""
+
+msgid "Africa/Lusaka"
+msgstr ""
+
+msgid "Africa/Malabo"
+msgstr ""
+
+msgid "Africa/Maputo"
+msgstr ""
+
+msgid "Africa/Maseru"
+msgstr ""
+
+msgid "Africa/Mbabane"
+msgstr ""
+
+msgid "Africa/Mogadishu"
+msgstr ""
+
+msgid "Africa/Monrovia"
+msgstr ""
+
+msgid "Africa/Nairobi"
+msgstr ""
+
+msgid "Africa/Ndjamena"
+msgstr ""
+
+msgid "Africa/Niamey"
+msgstr ""
+
+msgid "Africa/Nouakchott"
+msgstr ""
+
+msgid "Africa/Ouagadougou"
+msgstr ""
+
+msgid "Africa/Porto-Novo"
+msgstr ""
+
+msgid "Africa/Sao_Tome"
+msgstr ""
+
+msgid "Africa/Timbuktu"
+msgstr ""
+
+msgid "Africa/Tripoli"
+msgstr ""
+
+msgid "Africa/Tunis"
+msgstr ""
+
+msgid "Africa/Windhoek"
+msgstr ""
+
+msgid "America/Adak"
+msgstr ""
+
+msgid "America/Anchorage"
+msgstr ""
+
+msgid "America/Anguilla"
+msgstr ""
+
+msgid "America/Antigua"
+msgstr ""
+
+msgid "America/Araguaina"
+msgstr ""
+
+msgid "America/Argentina/Buenos_Aires"
+msgstr ""
+
+msgid "America/Argentina/Catamarca"
+msgstr ""
+
+msgid "America/Argentina/ComodRivadavia"
+msgstr ""
+
+msgid "America/Argentina/Cordoba"
+msgstr ""
+
+msgid "America/Argentina/Jujuy"
+msgstr ""
+
+msgid "America/Argentina/La_Rioja"
+msgstr ""
+
+msgid "America/Argentina/Mendoza"
+msgstr ""
+
+msgid "America/Argentina/Rio_Gallegos"
+msgstr ""
+
+msgid "America/Argentina/San_Juan"
+msgstr ""
+
+msgid "America/Argentina/Tucuman"
+msgstr ""
+
+msgid "America/Argentina/Ushuaia"
+msgstr ""
+
+msgid "America/Aruba"
+msgstr ""
+
+msgid "America/Asuncion"
+msgstr ""
+
+msgid "America/Atka"
+msgstr ""
+
+msgid "America/Bahia"
+msgstr ""
+
+msgid "America/Barbados"
+msgstr ""
+
+msgid "America/Belem"
+msgstr ""
+
+msgid "America/Belize"
+msgstr ""
+
+msgid "America/Boa_Vista"
+msgstr ""
+
+msgid "America/Bogota"
+msgstr ""
+
+msgid "America/Boise"
+msgstr ""
+
+msgid "America/Buenos_Aires"
+msgstr ""
+
+msgid "America/Cambridge_Bay"
+msgstr ""
+
+msgid "America/Campo_Grande"
+msgstr ""
+
+msgid "America/Cancun"
+msgstr ""
+
+msgid "America/Caracas"
+msgstr ""
+
+msgid "America/Catamarca"
+msgstr ""
+
+msgid "America/Cayenne"
+msgstr ""
+
+msgid "America/Cayman"
+msgstr ""
+
+msgid "America/Chicago"
+msgstr ""
+
+msgid "America/Chihuahua"
+msgstr ""
+
+msgid "America/Coral_Harbour"
+msgstr ""
+
+msgid "America/Cordoba"
+msgstr ""
+
+msgid "America/Costa_Rica"
+msgstr ""
+
+msgid "America/Cuiaba"
+msgstr ""
+
+msgid "America/Curacao"
+msgstr ""
+
+msgid "America/Danmarkshavn"
+msgstr ""
+
+msgid "America/Dawson"
+msgstr ""
+
+msgid "America/Dawson_Creek"
+msgstr ""
+
+msgid "America/Denver"
+msgstr ""
+
+msgid "America/Detroit"
+msgstr ""
+
+msgid "America/Dominica"
+msgstr ""
+
+msgid "America/Edmonton"
+msgstr ""
+
+msgid "America/Eirunepe"
+msgstr ""
+
+msgid "America/El_Salvador"
+msgstr ""
+
+msgid "America/Ensenada"
+msgstr ""
+
+msgid "America/Fort_Wayne"
+msgstr ""
+
+msgid "America/Fortaleza"
+msgstr ""
+
+msgid "America/Glace_Bay"
+msgstr ""
+
+msgid "America/Godthab"
+msgstr ""
+
+msgid "America/Goose_Bay"
+msgstr ""
+
+msgid "America/Grand_Turk"
+msgstr ""
+
+msgid "America/Grenada"
+msgstr ""
+
+msgid "America/Guadeloupe"
+msgstr ""
+
+msgid "America/Guatemala"
+msgstr ""
+
+msgid "America/Guayaquil"
+msgstr ""
+
+msgid "America/Guyana"
+msgstr ""
+
+msgid "America/Halifax"
+msgstr ""
+
+msgid "America/Havana"
+msgstr ""
+
+msgid "America/Hermosillo"
+msgstr ""
+
+msgid "America/Indiana/Indianapolis"
+msgstr ""
+
+msgid "America/Indiana/Knox"
+msgstr ""
+
+msgid "America/Indiana/Marengo"
+msgstr ""
+
+msgid "America/Indiana/Vevay"
+msgstr ""
+
+msgid "America/Indianapolis"
+msgstr ""
+
+msgid "America/Inuvik"
+msgstr ""
+
+msgid "America/Iqaluit"
+msgstr ""
+
+msgid "America/Jamaica"
+msgstr ""
+
+msgid "America/Jujuy"
+msgstr ""
+
+msgid "America/Juneau"
+msgstr ""
+
+msgid "America/Kentucky/Louisville"
+msgstr ""
+
+msgid "America/Kentucky/Monticello"
+msgstr ""
+
+msgid "America/Knox_IN"
+msgstr ""
+
+msgid "America/La_Paz"
+msgstr ""
+
+msgid "America/Lima"
+msgstr ""
+
+msgid "America/Los_Angeles"
+msgstr ""
+
+msgid "America/Louisville"
+msgstr ""
+
+msgid "America/Maceio"
+msgstr ""
+
+msgid "America/Managua"
+msgstr ""
+
+msgid "America/Manaus"
+msgstr ""
+
+msgid "America/Martinique"
+msgstr ""
+
+msgid "America/Mazatlan"
+msgstr ""
+
+msgid "America/Mendoza"
+msgstr ""
+
+msgid "America/Menominee"
+msgstr ""
+
+msgid "America/Merida"
+msgstr ""
+
+msgid "America/Mexico_City"
+msgstr ""
+
+msgid "America/Miquelon"
+msgstr ""
+
+msgid "America/Monterrey"
+msgstr ""
+
+msgid "America/Montevideo"
+msgstr ""
+
+msgid "America/Montreal"
+msgstr ""
+
+msgid "America/Montserrat"
+msgstr ""
+
+msgid "America/Nassau"
+msgstr ""
+
+msgid "America/New_York"
+msgstr ""
+
+msgid "America/Nipigon"
+msgstr ""
+
+msgid "America/Nome"
+msgstr ""
+
+msgid "America/Noronha"
+msgstr ""
+
+msgid "America/North_Dakota/Center"
+msgstr ""
+
+msgid "America/Panama"
+msgstr ""
+
+msgid "America/Pangnirtung"
+msgstr ""
+
+msgid "America/Paramaribo"
+msgstr ""
+
+msgid "America/Phoenix"
+msgstr ""
+
+msgid "America/Port-au-Prince"
+msgstr ""
+
+msgid "America/Port_of_Spain"
+msgstr ""
+
+msgid "America/Porto_Acre"
+msgstr ""
+
+msgid "America/Porto_Velho"
+msgstr ""
+
+msgid "America/Puerto_Rico"
+msgstr ""
+
+msgid "America/Rainy_River"
+msgstr ""
+
+msgid "America/Rankin_Inlet"
+msgstr ""
+
+msgid "America/Recife"
+msgstr ""
+
+msgid "America/Regina"
+msgstr ""
+
+msgid "America/Rio_Branco"
+msgstr ""
+
+msgid "America/Rosario"
+msgstr ""
+
+msgid "America/Santiago"
+msgstr ""
+
+msgid "America/Santo_Domingo"
+msgstr ""
+
+msgid "America/Sao_Paulo"
+msgstr ""
+
+msgid "America/Scoresbysund"
+msgstr ""
+
+msgid "America/Shiprock"
+msgstr ""
+
+msgid "America/St_Johns"
+msgstr ""
+
+msgid "America/St_Kitts"
+msgstr ""
+
+msgid "America/St_Lucia"
+msgstr ""
+
+msgid "America/St_Thomas"
+msgstr ""
+
+msgid "America/St_Vincent"
+msgstr ""
+
+msgid "America/Swift_Current"
+msgstr ""
+
+msgid "America/Tegucigalpa"
+msgstr ""
+
+msgid "America/Thule"
+msgstr ""
+
+msgid "America/Thunder_Bay"
+msgstr ""
+
+msgid "America/Tijuana"
+msgstr ""
+
+msgid "America/Toronto"
+msgstr ""
+
+msgid "America/Tortola"
+msgstr ""
+
+msgid "America/Vancouver"
+msgstr ""
+
+msgid "America/Virgin"
+msgstr ""
+
+msgid "America/Whitehorse"
+msgstr ""
+
+msgid "America/Winnipeg"
+msgstr ""
+
+msgid "America/Yakutat"
+msgstr ""
+
+msgid "America/Yellowknife"
+msgstr ""
+
+msgid "Antarctica/Casey"
+msgstr ""
+
+msgid "Antarctica/Davis"
+msgstr ""
+
+msgid "Antarctica/DumontDUrville"
+msgstr ""
+
+msgid "Antarctica/Mawson"
+msgstr ""
+
+msgid "Antarctica/McMurdo"
+msgstr ""
+
+msgid "Antarctica/Palmer"
+msgstr ""
+
+msgid "Antarctica/Rothera"
+msgstr ""
+
+msgid "Antarctica/South_Pole"
+msgstr ""
+
+msgid "Antarctica/Syowa"
+msgstr ""
+
+msgid "Antarctica/Vostok"
+msgstr ""
+
+msgid "Arctic/Longyearbyen"
+msgstr ""
+
+msgid "Asia/Aden"
+msgstr ""
+
+msgid "Asia/Almaty"
+msgstr ""
+
+msgid "Asia/Amman"
+msgstr ""
+
+msgid "Asia/Anadyr"
+msgstr ""
+
+msgid "Asia/Aqtau"
+msgstr ""
+
+msgid "Asia/Aqtobe"
+msgstr ""
+
+msgid "Asia/Ashgabat"
+msgstr ""
+
+msgid "Asia/Ashkhabad"
+msgstr ""
+
+msgid "Asia/Baghdad"
+msgstr ""
+
+msgid "Asia/Bahrain"
+msgstr ""
+
+msgid "Asia/Baku"
+msgstr ""
+
+msgid "Asia/Bangkok"
+msgstr ""
+
+msgid "Asia/Beirut"
+msgstr ""
+
+msgid "Asia/Bishkek"
+msgstr ""
+
+msgid "Asia/Brunei"
+msgstr ""
+
+msgid "Asia/Calcutta"
+msgstr ""
+
+msgid "Asia/Choibalsan"
+msgstr ""
+
+msgid "Asia/Chongqing"
+msgstr ""
+
+msgid "Asia/Chungking"
+msgstr ""
+
+msgid "Asia/Colombo"
+msgstr ""
+
+msgid "Asia/Dacca"
+msgstr ""
+
+msgid "Asia/Damascus"
+msgstr ""
+
+msgid "Asia/Dhaka"
+msgstr ""
+
+msgid "Asia/Dili"
+msgstr ""
+
+msgid "Asia/Dubai"
+msgstr ""
+
+msgid "Asia/Dushanbe"
+msgstr ""
+
+msgid "Asia/Gaza"
+msgstr ""
+
+msgid "Asia/Harbin"
+msgstr ""
+
+msgid "Asia/Hong_Kong"
+msgstr ""
+
+msgid "Asia/Hovd"
+msgstr ""
+
+msgid "Asia/Irkutsk"
+msgstr ""
+
+msgid "Asia/Istanbul"
+msgstr ""
+
+msgid "Asia/Jakarta"
+msgstr ""
+
+msgid "Asia/Jayapura"
+msgstr ""
+
+msgid "Asia/Jerusalem"
+msgstr ""
+
+msgid "Asia/Kabul"
+msgstr ""
+
+msgid "Asia/Kamchatka"
+msgstr ""
+
+msgid "Asia/Karachi"
+msgstr ""
+
+msgid "Asia/Kashgar"
+msgstr ""
+
+msgid "Asia/Katmandu"
+msgstr ""
+
+msgid "Asia/Krasnoyarsk"
+msgstr ""
+
+msgid "Asia/Kuala_Lumpur"
+msgstr ""
+
+msgid "Asia/Kuching"
+msgstr ""
+
+msgid "Asia/Kuwait"
+msgstr ""
+
+msgid "Asia/Macao"
+msgstr ""
+
+msgid "Asia/Macau"
+msgstr ""
+
+msgid "Asia/Magadan"
+msgstr ""
+
+msgid "Asia/Makassar"
+msgstr ""
+
+msgid "Asia/Manila"
+msgstr ""
+
+msgid "Asia/Muscat"
+msgstr ""
+
+msgid "Asia/Nicosia"
+msgstr ""
+
+msgid "Asia/Novosibirsk"
+msgstr ""
+
+msgid "Asia/Omsk"
+msgstr ""
+
+msgid "Asia/Oral"
+msgstr ""
+
+msgid "Asia/Phnom_Penh"
+msgstr ""
+
+msgid "Asia/Pontianak"
+msgstr ""
+
+msgid "Asia/Pyongyang"
+msgstr ""
+
+msgid "Asia/Qatar"
+msgstr ""
+
+msgid "Asia/Qyzylorda"
+msgstr ""
+
+msgid "Asia/Rangoon"
+msgstr ""
+
+msgid "Asia/Riyadh"
+msgstr ""
+
+msgid "Asia/Saigon"
+msgstr ""
+
+msgid "Asia/Sakhalin"
+msgstr ""
+
+msgid "Asia/Samarkand"
+msgstr ""
+
+msgid "Asia/Seoul"
+msgstr ""
+
+msgid "Asia/Shanghai"
+msgstr ""
+
+msgid "Asia/Singapore"
+msgstr ""
+
+msgid "Asia/Taipei"
+msgstr ""
+
+msgid "Asia/Tashkent"
+msgstr ""
+
+msgid "Asia/Tbilisi"
+msgstr ""
+
+msgid "Asia/Tehran"
+msgstr ""
+
+msgid "Asia/Tel_Aviv"
+msgstr ""
+
+msgid "Asia/Thimbu"
+msgstr ""
+
+msgid "Asia/Thimphu"
+msgstr ""
+
+msgid "Asia/Tokyo"
+msgstr ""
+
+msgid "Asia/Ujung_Pandang"
+msgstr ""
+
+msgid "Asia/Ulaanbaatar"
+msgstr ""
+
+msgid "Asia/Ulan_Bator"
+msgstr ""
+
+msgid "Asia/Urumqi"
+msgstr ""
+
+msgid "Asia/Vientiane"
+msgstr ""
+
+msgid "Asia/Vladivostok"
+msgstr ""
+
+msgid "Asia/Yakutsk"
+msgstr ""
+
+msgid "Asia/Yekaterinburg"
+msgstr ""
+
+msgid "Asia/Yerevan"
+msgstr ""
+
+msgid "Atlantic/Azores"
+msgstr ""
+
+msgid "Atlantic/Bermuda"
+msgstr ""
+
+msgid "Atlantic/Canary"
+msgstr ""
+
+msgid "Atlantic/Cape_Verde"
+msgstr ""
+
+msgid "Atlantic/Faeroe"
+msgstr ""
+
+msgid "Atlantic/Jan_Mayen"
+msgstr ""
+
+msgid "Atlantic/Madeira"
+msgstr ""
+
+msgid "Atlantic/Reykjavik"
+msgstr ""
+
+msgid "Atlantic/South_Georgia"
+msgstr ""
+
+msgid "Atlantic/St_Helena"
+msgstr ""
+
+msgid "Atlantic/Stanley"
+msgstr ""
+
+msgid "Australia/ACT"
+msgstr ""
+
+msgid "Australia/Adelaide"
+msgstr ""
+
+msgid "Australia/Brisbane"
+msgstr ""
+
+msgid "Australia/Broken_Hill"
+msgstr ""
+
+msgid "Australia/Canberra"
+msgstr ""
+
+msgid "Australia/Currie"
+msgstr ""
+
+msgid "Australia/Darwin"
+msgstr ""
+
+msgid "Australia/Hobart"
+msgstr ""
+
+msgid "Australia/LHI"
+msgstr ""
+
+msgid "Australia/Lindeman"
+msgstr ""
+
+msgid "Australia/Lord_Howe"
+msgstr ""
+
+msgid "Australia/Melbourne"
+msgstr ""
+
+msgid "Australia/NSW"
+msgstr ""
+
+msgid "Australia/North"
+msgstr ""
+
+msgid "Australia/Perth"
+msgstr ""
+
+msgid "Australia/Queensland"
+msgstr ""
+
+msgid "Australia/South"
+msgstr ""
+
+msgid "Australia/Sydney"
+msgstr ""
+
+msgid "Australia/Tasmania"
+msgstr ""
+
+msgid "Australia/Victoria"
+msgstr ""
+
+msgid "Australia/West"
+msgstr ""
+
+msgid "Australia/Yancowinna"
+msgstr ""
+
+msgid "Brazil/Acre"
+msgstr ""
+
+msgid "Brazil/DeNoronha"
+msgstr ""
+
+msgid "Brazil/East"
+msgstr ""
+
+msgid "Brazil/West"
+msgstr ""
+
+msgid "CET"
+msgstr ""
+
+msgid "CST6CDT"
+msgstr ""
+
+msgid "Canada/Atlantic"
+msgstr ""
+
+msgid "Canada/Central"
+msgstr ""
+
+msgid "Canada/East-Saskatchewan"
+msgstr ""
+
+msgid "Canada/Eastern"
+msgstr ""
+
+msgid "Canada/Mountain"
+msgstr ""
+
+msgid "Canada/Newfoundland"
+msgstr ""
+
+msgid "Canada/Pacific"
+msgstr ""
+
+msgid "Canada/Saskatchewan"
+msgstr ""
+
+msgid "Canada/Yukon"
+msgstr ""
+
+msgid "Chile/Continental"
+msgstr ""
+
+msgid "Chile/EasterIsland"
+msgstr ""
+
+msgid "Cuba"
+msgstr ""
+
+msgid "EET"
+msgstr ""
+
+msgid "EST"
+msgstr ""
+
+msgid "EST5EDT"
+msgstr ""
+
+msgid "Egypt"
+msgstr ""
+
+msgid "Eire"
+msgstr ""
+
+msgid "Etc/GMT"
+msgstr ""
+
+msgid "Etc/GMT+0"
+msgstr ""
+
+msgid "Etc/GMT+1"
+msgstr ""
+
+msgid "Etc/GMT+10"
+msgstr ""
+
+msgid "Etc/GMT+11"
+msgstr ""
+
+msgid "Etc/GMT+12"
+msgstr ""
+
+msgid "Etc/GMT+2"
+msgstr ""
+
+msgid "Etc/GMT+3"
+msgstr ""
+
+msgid "Etc/GMT+4"
+msgstr ""
+
+msgid "Etc/GMT+5"
+msgstr ""
+
+msgid "Etc/GMT+6"
+msgstr ""
+
+msgid "Etc/GMT+7"
+msgstr ""
+
+msgid "Etc/GMT+8"
+msgstr ""
+
+msgid "Etc/GMT+9"
+msgstr ""
+
+msgid "Etc/GMT-0"
+msgstr ""
+
+msgid "Etc/GMT-1"
+msgstr ""
+
+msgid "Etc/GMT-10"
+msgstr ""
+
+msgid "Etc/GMT-11"
+msgstr ""
+
+msgid "Etc/GMT-12"
+msgstr ""
+
+msgid "Etc/GMT-13"
+msgstr ""
+
+msgid "Etc/GMT-14"
+msgstr ""
+
+msgid "Etc/GMT-2"
+msgstr ""
+
+msgid "Etc/GMT-3"
+msgstr ""
+
+msgid "Etc/GMT-4"
+msgstr ""
+
+msgid "Etc/GMT-5"
+msgstr ""
+
+msgid "Etc/GMT-6"
+msgstr ""
+
+msgid "Etc/GMT-7"
+msgstr ""
+
+msgid "Etc/GMT-8"
+msgstr ""
+
+msgid "Etc/GMT-9"
+msgstr ""
+
+msgid "Etc/GMT0"
+msgstr ""
+
+msgid "Etc/Greenwich"
+msgstr ""
+
+msgid "Etc/UCT"
+msgstr ""
+
+msgid "Etc/UTC"
+msgstr ""
+
+msgid "Etc/Universal"
+msgstr ""
+
+msgid "Etc/Zulu"
+msgstr ""
+
+msgid "Europe/Amsterdam"
+msgstr ""
+
+msgid "Europe/Andorra"
+msgstr ""
+
+msgid "Europe/Athens"
+msgstr ""
+
+msgid "Europe/Belfast"
+msgstr ""
+
+msgid "Europe/Belgrade"
+msgstr ""
+
+msgid "Europe/Berlin"
+msgstr ""
+
+msgid "Europe/Bratislava"
+msgstr ""
+
+msgid "Europe/Brussels"
+msgstr ""
+
+msgid "Europe/Bucharest"
+msgstr ""
+
+msgid "Europe/Budapest"
+msgstr ""
+
+msgid "Europe/Chisinau"
+msgstr ""
+
+msgid "Europe/Copenhagen"
+msgstr ""
+
+msgid "Europe/Dublin"
+msgstr ""
+
+msgid "Europe/Gibraltar"
+msgstr ""
+
+msgid "Europe/Helsinki"
+msgstr ""
+
+msgid "Europe/Istanbul"
+msgstr ""
+
+msgid "Europe/Kaliningrad"
+msgstr ""
+
+msgid "Europe/Kiev"
+msgstr ""
+
+msgid "Europe/Lisbon"
+msgstr ""
+
+msgid "Europe/Ljubljana"
+msgstr ""
+
+msgid "Europe/London"
+msgstr ""
+
+msgid "Europe/Luxembourg"
+msgstr ""
+
+msgid "Europe/Madrid"
+msgstr ""
+
+msgid "Europe/Malta"
+msgstr ""
+
+msgid "Europe/Mariehamn"
+msgstr ""
+
+msgid "Europe/Minsk"
+msgstr ""
+
+msgid "Europe/Monaco"
+msgstr ""
+
+msgid "Europe/Moscow"
+msgstr ""
+
+msgid "Europe/Nicosia"
+msgstr ""
+
+msgid "Europe/Oslo"
+msgstr ""
+
+msgid "Europe/Paris"
+msgstr ""
+
+msgid "Europe/Prague"
+msgstr ""
+
+msgid "Europe/Riga"
+msgstr ""
+
+msgid "Europe/Rome"
+msgstr ""
+
+msgid "Europe/Samara"
+msgstr ""
+
+msgid "Europe/San_Marino"
+msgstr ""
+
+msgid "Europe/Sarajevo"
+msgstr ""
+
+msgid "Europe/Simferopol"
+msgstr ""
+
+msgid "Europe/Skopje"
+msgstr ""
+
+msgid "Europe/Sofia"
+msgstr ""
+
+msgid "Europe/Stockholm"
+msgstr ""
+
+msgid "Europe/Tallinn"
+msgstr ""
+
+msgid "Europe/Tirane"
+msgstr ""
+
+msgid "Europe/Tiraspol"
+msgstr ""
+
+msgid "Europe/Uzhgorod"
+msgstr ""
+
+msgid "Europe/Vaduz"
+msgstr ""
+
+msgid "Europe/Vatican"
+msgstr ""
+
+msgid "Europe/Vienna"
+msgstr ""
+
+msgid "Europe/Vilnius"
+msgstr ""
+
+msgid "Europe/Warsaw"
+msgstr ""
+
+msgid "Europe/Zagreb"
+msgstr ""
+
+msgid "Europe/Zaporozhye"
+msgstr ""
+
+msgid "Europe/Zurich"
+msgstr ""
+
+msgid "GB"
+msgstr ""
+
+msgid "GB-Eire"
+msgstr ""
+
+msgid "GMT"
+msgstr ""
+
+msgid "GMT+0"
+msgstr ""
+
+msgid "GMT-0"
+msgstr ""
+
+msgid "GMT0"
+msgstr ""
+
+msgid "Greenwich"
+msgstr ""
+
+msgid "HST"
+msgstr ""
+
+msgid "Hongkong"
+msgstr ""
+
+msgid "Iceland"
+msgstr ""
+
+msgid "Indian/Antananarivo"
+msgstr ""
+
+msgid "Indian/Chagos"
+msgstr ""
+
+msgid "Indian/Christmas"
+msgstr ""
+
+msgid "Indian/Cocos"
+msgstr ""
+
+msgid "Indian/Comoro"
+msgstr ""
+
+msgid "Indian/Kerguelen"
+msgstr ""
+
+msgid "Indian/Mahe"
+msgstr ""
+
+msgid "Indian/Maldives"
+msgstr ""
+
+msgid "Indian/Mauritius"
+msgstr ""
+
+msgid "Indian/Mayotte"
+msgstr ""
+
+msgid "Indian/Reunion"
+msgstr ""
+
+msgid "Iran"
+msgstr ""
+
+msgid "Israel"
+msgstr ""
+
+msgid "Jamaica"
+msgstr ""
+
+msgid "Japan"
+msgstr ""
+
+msgid "Kwajalein"
+msgstr ""
+
+msgid "Libya"
+msgstr ""
+
+msgid "MET"
+msgstr ""
+
+msgid "MST"
+msgstr ""
+
+msgid "MST7MDT"
+msgstr ""
+
+msgid "Mexico/BajaNorte"
+msgstr ""
+
+msgid "Mexico/BajaSur"
+msgstr ""
+
+msgid "Mexico/General"
+msgstr ""
+
+msgid "NZ"
+msgstr ""
+
+msgid "NZ-CHAT"
+msgstr ""
+
+msgid "Navajo"
+msgstr ""
+
+msgid "PRC"
+msgstr ""
+
+msgid "PST8PDT"
+msgstr ""
+
+msgid "Pacific/Apia"
+msgstr ""
+
+msgid "Pacific/Auckland"
+msgstr ""
+
+msgid "Pacific/Chatham"
+msgstr ""
+
+msgid "Pacific/Easter"
+msgstr ""
+
+msgid "Pacific/Efate"
+msgstr ""
+
+msgid "Pacific/Enderbury"
+msgstr ""
+
+msgid "Pacific/Fakaofo"
+msgstr ""
+
+msgid "Pacific/Fiji"
+msgstr ""
+
+msgid "Pacific/Funafuti"
+msgstr ""
+
+msgid "Pacific/Galapagos"
+msgstr ""
+
+msgid "Pacific/Gambier"
+msgstr ""
+
+msgid "Pacific/Guadalcanal"
+msgstr ""
+
+msgid "Pacific/Guam"
+msgstr ""
+
+msgid "Pacific/Honolulu"
+msgstr ""
+
+msgid "Pacific/Johnston"
+msgstr ""
+
+msgid "Pacific/Kiritimati"
+msgstr ""
+
+msgid "Pacific/Kosrae"
+msgstr ""
+
+msgid "Pacific/Kwajalein"
+msgstr ""
+
+msgid "Pacific/Majuro"
+msgstr ""
+
+msgid "Pacific/Marquesas"
+msgstr ""
+
+msgid "Pacific/Midway"
+msgstr ""
+
+msgid "Pacific/Nauru"
+msgstr ""
+
+msgid "Pacific/Niue"
+msgstr ""
+
+msgid "Pacific/Norfolk"
+msgstr ""
+
+msgid "Pacific/Noumea"
+msgstr ""
+
+msgid "Pacific/Pago_Pago"
+msgstr ""
+
+msgid "Pacific/Palau"
+msgstr ""
+
+msgid "Pacific/Pitcairn"
+msgstr ""
+
+msgid "Pacific/Ponape"
+msgstr ""
+
+msgid "Pacific/Port_Moresby"
+msgstr ""
+
+msgid "Pacific/Rarotonga"
+msgstr ""
+
+msgid "Pacific/Saipan"
+msgstr ""
+
+msgid "Pacific/Samoa"
+msgstr ""
+
+msgid "Pacific/Tahiti"
+msgstr ""
+
+msgid "Pacific/Tarawa"
+msgstr ""
+
+msgid "Pacific/Tongatapu"
+msgstr ""
+
+msgid "Pacific/Truk"
+msgstr ""
+
+msgid "Pacific/Wake"
+msgstr ""
+
+msgid "Pacific/Wallis"
+msgstr ""
+
+msgid "Pacific/Yap"
+msgstr ""
+
+msgid "Poland"
+msgstr ""
+
+msgid "Portugal"
+msgstr ""
+
+msgid "ROC"
+msgstr ""
+
+msgid "ROK"
+msgstr ""
+
+msgid "Singapore"
+msgstr ""
+
+msgid "Turkey"
+msgstr ""
+
+msgid "UCT"
+msgstr ""
+
+msgid "US/Alaska"
+msgstr ""
+
+msgid "US/Aleutian"
+msgstr ""
+
+msgid "US/Arizona"
+msgstr ""
+
+msgid "US/Central"
+msgstr ""
+
+msgid "US/East-Indiana"
+msgstr ""
+
+msgid "US/Eastern"
+msgstr ""
+
+msgid "US/Hawaii"
+msgstr ""
+
+msgid "US/Indiana-Starke"
+msgstr ""
+
+msgid "US/Michigan"
+msgstr ""
+
+msgid "US/Mountain"
+msgstr ""
+
+msgid "US/Pacific"
+msgstr ""
+
+msgid "US/Pacific-New"
+msgstr ""
+
+msgid "US/Samoa"
+msgstr ""
+
+msgid "UTC"
+msgstr ""
+
+msgid "Universal"
+msgstr ""
+
+msgid "W-SU"
+msgstr ""
+
+msgid "WET"
+msgstr ""
+
+msgid "Zulu"
+msgstr ""
+
+msgid "posixrules"
+msgstr ""
+


Property changes on: Zope3/trunk/src/pytz/locales/pytz.pot
___________________________________________________________________
Name: svn:keywords "LastChangedDate Author Id LastChangedRevision LastChangedBy HeadURL"
   + 
Name: svn:eol-style
   + native

Modified: Zope3/trunk/src/pytz/tests/test_tzinfo.py
===================================================================
--- Zope3/trunk/src/pytz/tests/test_tzinfo.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/tests/test_tzinfo.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -13,6 +13,8 @@
 import pytz
 from pytz import reference
 
+EXPECTED_VERSION='2005r'
+
 fmt = '%Y-%m-%d %H:%M:%S %Z%z'
 
 NOTIME = timedelta(0)
@@ -26,9 +28,10 @@
 
     def testVersion(self):
         # Ensuring the correct version of pytz has been loaded
-        self.failUnlessEqual('2005m', pytz.__version__,
+        self.failUnlessEqual(EXPECTED_VERSION, pytz.__version__,
                 'Incorrect pytz version loaded. Import path is stuffed '
-                'or this test needs updating.'
+                'or this test needs updating. (Wanted %s, got %s)'
+                % (EXPECTED_VERSION, pytz.__version__)
                 )
 
     def testGMT(self):

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Cambridge_Bay.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Cambridge_Bay.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Cambridge_Bay.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -74,68 +74,68 @@
 d(2005,10,30,8,0,0),
 d(2006,4,2,9,0,0),
 d(2006,10,29,8,0,0),
-d(2007,4,1,9,0,0),
-d(2007,10,28,8,0,0),
-d(2008,4,6,9,0,0),
-d(2008,10,26,8,0,0),
-d(2009,4,5,9,0,0),
-d(2009,10,25,8,0,0),
-d(2010,4,4,9,0,0),
-d(2010,10,31,8,0,0),
-d(2011,4,3,9,0,0),
-d(2011,10,30,8,0,0),
-d(2012,4,1,9,0,0),
-d(2012,10,28,8,0,0),
-d(2013,4,7,9,0,0),
-d(2013,10,27,8,0,0),
-d(2014,4,6,9,0,0),
-d(2014,10,26,8,0,0),
-d(2015,4,5,9,0,0),
-d(2015,10,25,8,0,0),
-d(2016,4,3,9,0,0),
-d(2016,10,30,8,0,0),
-d(2017,4,2,9,0,0),
-d(2017,10,29,8,0,0),
-d(2018,4,1,9,0,0),
-d(2018,10,28,8,0,0),
-d(2019,4,7,9,0,0),
-d(2019,10,27,8,0,0),
-d(2020,4,5,9,0,0),
-d(2020,10,25,8,0,0),
-d(2021,4,4,9,0,0),
-d(2021,10,31,8,0,0),
-d(2022,4,3,9,0,0),
-d(2022,10,30,8,0,0),
-d(2023,4,2,9,0,0),
-d(2023,10,29,8,0,0),
-d(2024,4,7,9,0,0),
-d(2024,10,27,8,0,0),
-d(2025,4,6,9,0,0),
-d(2025,10,26,8,0,0),
-d(2026,4,5,9,0,0),
-d(2026,10,25,8,0,0),
-d(2027,4,4,9,0,0),
-d(2027,10,31,8,0,0),
-d(2028,4,2,9,0,0),
-d(2028,10,29,8,0,0),
-d(2029,4,1,9,0,0),
-d(2029,10,28,8,0,0),
-d(2030,4,7,9,0,0),
-d(2030,10,27,8,0,0),
-d(2031,4,6,9,0,0),
-d(2031,10,26,8,0,0),
-d(2032,4,4,9,0,0),
-d(2032,10,31,8,0,0),
-d(2033,4,3,9,0,0),
-d(2033,10,30,8,0,0),
-d(2034,4,2,9,0,0),
-d(2034,10,29,8,0,0),
-d(2035,4,1,9,0,0),
-d(2035,10,28,8,0,0),
-d(2036,4,6,9,0,0),
-d(2036,10,26,8,0,0),
-d(2037,4,5,9,0,0),
-d(2037,10,25,8,0,0),
+d(2007,3,11,9,0,0),
+d(2007,11,4,8,0,0),
+d(2008,3,9,9,0,0),
+d(2008,11,2,8,0,0),
+d(2009,3,8,9,0,0),
+d(2009,11,1,8,0,0),
+d(2010,3,14,9,0,0),
+d(2010,11,7,8,0,0),
+d(2011,3,13,9,0,0),
+d(2011,11,6,8,0,0),
+d(2012,3,11,9,0,0),
+d(2012,11,4,8,0,0),
+d(2013,3,10,9,0,0),
+d(2013,11,3,8,0,0),
+d(2014,3,9,9,0,0),
+d(2014,11,2,8,0,0),
+d(2015,3,8,9,0,0),
+d(2015,11,1,8,0,0),
+d(2016,3,13,9,0,0),
+d(2016,11,6,8,0,0),
+d(2017,3,12,9,0,0),
+d(2017,11,5,8,0,0),
+d(2018,3,11,9,0,0),
+d(2018,11,4,8,0,0),
+d(2019,3,10,9,0,0),
+d(2019,11,3,8,0,0),
+d(2020,3,8,9,0,0),
+d(2020,11,1,8,0,0),
+d(2021,3,14,9,0,0),
+d(2021,11,7,8,0,0),
+d(2022,3,13,9,0,0),
+d(2022,11,6,8,0,0),
+d(2023,3,12,9,0,0),
+d(2023,11,5,8,0,0),
+d(2024,3,10,9,0,0),
+d(2024,11,3,8,0,0),
+d(2025,3,9,9,0,0),
+d(2025,11,2,8,0,0),
+d(2026,3,8,9,0,0),
+d(2026,11,1,8,0,0),
+d(2027,3,14,9,0,0),
+d(2027,11,7,8,0,0),
+d(2028,3,12,9,0,0),
+d(2028,11,5,8,0,0),
+d(2029,3,11,9,0,0),
+d(2029,11,4,8,0,0),
+d(2030,3,10,9,0,0),
+d(2030,11,3,8,0,0),
+d(2031,3,9,9,0,0),
+d(2031,11,2,8,0,0),
+d(2032,3,14,9,0,0),
+d(2032,11,7,8,0,0),
+d(2033,3,13,9,0,0),
+d(2033,11,6,8,0,0),
+d(2034,3,12,9,0,0),
+d(2034,11,5,8,0,0),
+d(2035,3,11,9,0,0),
+d(2035,11,4,8,0,0),
+d(2036,3,9,9,0,0),
+d(2036,11,2,8,0,0),
+d(2037,3,8,9,0,0),
+d(2037,11,1,8,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Glace_Bay.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Glace_Bay.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Glace_Bay.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -88,68 +88,68 @@
 d(2005,10,30,5,0,0),
 d(2006,4,2,6,0,0),
 d(2006,10,29,5,0,0),
-d(2007,4,1,6,0,0),
-d(2007,10,28,5,0,0),
-d(2008,4,6,6,0,0),
-d(2008,10,26,5,0,0),
-d(2009,4,5,6,0,0),
-d(2009,10,25,5,0,0),
-d(2010,4,4,6,0,0),
-d(2010,10,31,5,0,0),
-d(2011,4,3,6,0,0),
-d(2011,10,30,5,0,0),
-d(2012,4,1,6,0,0),
-d(2012,10,28,5,0,0),
-d(2013,4,7,6,0,0),
-d(2013,10,27,5,0,0),
-d(2014,4,6,6,0,0),
-d(2014,10,26,5,0,0),
-d(2015,4,5,6,0,0),
-d(2015,10,25,5,0,0),
-d(2016,4,3,6,0,0),
-d(2016,10,30,5,0,0),
-d(2017,4,2,6,0,0),
-d(2017,10,29,5,0,0),
-d(2018,4,1,6,0,0),
-d(2018,10,28,5,0,0),
-d(2019,4,7,6,0,0),
-d(2019,10,27,5,0,0),
-d(2020,4,5,6,0,0),
-d(2020,10,25,5,0,0),
-d(2021,4,4,6,0,0),
-d(2021,10,31,5,0,0),
-d(2022,4,3,6,0,0),
-d(2022,10,30,5,0,0),
-d(2023,4,2,6,0,0),
-d(2023,10,29,5,0,0),
-d(2024,4,7,6,0,0),
-d(2024,10,27,5,0,0),
-d(2025,4,6,6,0,0),
-d(2025,10,26,5,0,0),
-d(2026,4,5,6,0,0),
-d(2026,10,25,5,0,0),
-d(2027,4,4,6,0,0),
-d(2027,10,31,5,0,0),
-d(2028,4,2,6,0,0),
-d(2028,10,29,5,0,0),
-d(2029,4,1,6,0,0),
-d(2029,10,28,5,0,0),
-d(2030,4,7,6,0,0),
-d(2030,10,27,5,0,0),
-d(2031,4,6,6,0,0),
-d(2031,10,26,5,0,0),
-d(2032,4,4,6,0,0),
-d(2032,10,31,5,0,0),
-d(2033,4,3,6,0,0),
-d(2033,10,30,5,0,0),
-d(2034,4,2,6,0,0),
-d(2034,10,29,5,0,0),
-d(2035,4,1,6,0,0),
-d(2035,10,28,5,0,0),
-d(2036,4,6,6,0,0),
-d(2036,10,26,5,0,0),
-d(2037,4,5,6,0,0),
-d(2037,10,25,5,0,0),
+d(2007,3,11,6,0,0),
+d(2007,11,4,5,0,0),
+d(2008,3,9,6,0,0),
+d(2008,11,2,5,0,0),
+d(2009,3,8,6,0,0),
+d(2009,11,1,5,0,0),
+d(2010,3,14,6,0,0),
+d(2010,11,7,5,0,0),
+d(2011,3,13,6,0,0),
+d(2011,11,6,5,0,0),
+d(2012,3,11,6,0,0),
+d(2012,11,4,5,0,0),
+d(2013,3,10,6,0,0),
+d(2013,11,3,5,0,0),
+d(2014,3,9,6,0,0),
+d(2014,11,2,5,0,0),
+d(2015,3,8,6,0,0),
+d(2015,11,1,5,0,0),
+d(2016,3,13,6,0,0),
+d(2016,11,6,5,0,0),
+d(2017,3,12,6,0,0),
+d(2017,11,5,5,0,0),
+d(2018,3,11,6,0,0),
+d(2018,11,4,5,0,0),
+d(2019,3,10,6,0,0),
+d(2019,11,3,5,0,0),
+d(2020,3,8,6,0,0),
+d(2020,11,1,5,0,0),
+d(2021,3,14,6,0,0),
+d(2021,11,7,5,0,0),
+d(2022,3,13,6,0,0),
+d(2022,11,6,5,0,0),
+d(2023,3,12,6,0,0),
+d(2023,11,5,5,0,0),
+d(2024,3,10,6,0,0),
+d(2024,11,3,5,0,0),
+d(2025,3,9,6,0,0),
+d(2025,11,2,5,0,0),
+d(2026,3,8,6,0,0),
+d(2026,11,1,5,0,0),
+d(2027,3,14,6,0,0),
+d(2027,11,7,5,0,0),
+d(2028,3,12,6,0,0),
+d(2028,11,5,5,0,0),
+d(2029,3,11,6,0,0),
+d(2029,11,4,5,0,0),
+d(2030,3,10,6,0,0),
+d(2030,11,3,5,0,0),
+d(2031,3,9,6,0,0),
+d(2031,11,2,5,0,0),
+d(2032,3,14,6,0,0),
+d(2032,11,7,5,0,0),
+d(2033,3,13,6,0,0),
+d(2033,11,6,5,0,0),
+d(2034,3,12,6,0,0),
+d(2034,11,5,5,0,0),
+d(2035,3,11,6,0,0),
+d(2035,11,4,5,0,0),
+d(2036,3,9,6,0,0),
+d(2036,11,2,5,0,0),
+d(2037,3,8,6,0,0),
+d(2037,11,1,5,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Halifax.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Halifax.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Halifax.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -176,68 +176,68 @@
 d(2005,10,30,5,0,0),
 d(2006,4,2,6,0,0),
 d(2006,10,29,5,0,0),
-d(2007,4,1,6,0,0),
-d(2007,10,28,5,0,0),
-d(2008,4,6,6,0,0),
-d(2008,10,26,5,0,0),
-d(2009,4,5,6,0,0),
-d(2009,10,25,5,0,0),
-d(2010,4,4,6,0,0),
-d(2010,10,31,5,0,0),
-d(2011,4,3,6,0,0),
-d(2011,10,30,5,0,0),
-d(2012,4,1,6,0,0),
-d(2012,10,28,5,0,0),
-d(2013,4,7,6,0,0),
-d(2013,10,27,5,0,0),
-d(2014,4,6,6,0,0),
-d(2014,10,26,5,0,0),
-d(2015,4,5,6,0,0),
-d(2015,10,25,5,0,0),
-d(2016,4,3,6,0,0),
-d(2016,10,30,5,0,0),
-d(2017,4,2,6,0,0),
-d(2017,10,29,5,0,0),
-d(2018,4,1,6,0,0),
-d(2018,10,28,5,0,0),
-d(2019,4,7,6,0,0),
-d(2019,10,27,5,0,0),
-d(2020,4,5,6,0,0),
-d(2020,10,25,5,0,0),
-d(2021,4,4,6,0,0),
-d(2021,10,31,5,0,0),
-d(2022,4,3,6,0,0),
-d(2022,10,30,5,0,0),
-d(2023,4,2,6,0,0),
-d(2023,10,29,5,0,0),
-d(2024,4,7,6,0,0),
-d(2024,10,27,5,0,0),
-d(2025,4,6,6,0,0),
-d(2025,10,26,5,0,0),
-d(2026,4,5,6,0,0),
-d(2026,10,25,5,0,0),
-d(2027,4,4,6,0,0),
-d(2027,10,31,5,0,0),
-d(2028,4,2,6,0,0),
-d(2028,10,29,5,0,0),
-d(2029,4,1,6,0,0),
-d(2029,10,28,5,0,0),
-d(2030,4,7,6,0,0),
-d(2030,10,27,5,0,0),
-d(2031,4,6,6,0,0),
-d(2031,10,26,5,0,0),
-d(2032,4,4,6,0,0),
-d(2032,10,31,5,0,0),
-d(2033,4,3,6,0,0),
-d(2033,10,30,5,0,0),
-d(2034,4,2,6,0,0),
-d(2034,10,29,5,0,0),
-d(2035,4,1,6,0,0),
-d(2035,10,28,5,0,0),
-d(2036,4,6,6,0,0),
-d(2036,10,26,5,0,0),
-d(2037,4,5,6,0,0),
-d(2037,10,25,5,0,0),
+d(2007,3,11,6,0,0),
+d(2007,11,4,5,0,0),
+d(2008,3,9,6,0,0),
+d(2008,11,2,5,0,0),
+d(2009,3,8,6,0,0),
+d(2009,11,1,5,0,0),
+d(2010,3,14,6,0,0),
+d(2010,11,7,5,0,0),
+d(2011,3,13,6,0,0),
+d(2011,11,6,5,0,0),
+d(2012,3,11,6,0,0),
+d(2012,11,4,5,0,0),
+d(2013,3,10,6,0,0),
+d(2013,11,3,5,0,0),
+d(2014,3,9,6,0,0),
+d(2014,11,2,5,0,0),
+d(2015,3,8,6,0,0),
+d(2015,11,1,5,0,0),
+d(2016,3,13,6,0,0),
+d(2016,11,6,5,0,0),
+d(2017,3,12,6,0,0),
+d(2017,11,5,5,0,0),
+d(2018,3,11,6,0,0),
+d(2018,11,4,5,0,0),
+d(2019,3,10,6,0,0),
+d(2019,11,3,5,0,0),
+d(2020,3,8,6,0,0),
+d(2020,11,1,5,0,0),
+d(2021,3,14,6,0,0),
+d(2021,11,7,5,0,0),
+d(2022,3,13,6,0,0),
+d(2022,11,6,5,0,0),
+d(2023,3,12,6,0,0),
+d(2023,11,5,5,0,0),
+d(2024,3,10,6,0,0),
+d(2024,11,3,5,0,0),
+d(2025,3,9,6,0,0),
+d(2025,11,2,5,0,0),
+d(2026,3,8,6,0,0),
+d(2026,11,1,5,0,0),
+d(2027,3,14,6,0,0),
+d(2027,11,7,5,0,0),
+d(2028,3,12,6,0,0),
+d(2028,11,5,5,0,0),
+d(2029,3,11,6,0,0),
+d(2029,11,4,5,0,0),
+d(2030,3,10,6,0,0),
+d(2030,11,3,5,0,0),
+d(2031,3,9,6,0,0),
+d(2031,11,2,5,0,0),
+d(2032,3,14,6,0,0),
+d(2032,11,7,5,0,0),
+d(2033,3,13,6,0,0),
+d(2033,11,6,5,0,0),
+d(2034,3,12,6,0,0),
+d(2034,11,5,5,0,0),
+d(2035,3,11,6,0,0),
+d(2035,11,4,5,0,0),
+d(2036,3,9,6,0,0),
+d(2036,11,2,5,0,0),
+d(2037,3,8,6,0,0),
+d(2037,11,1,5,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Havana.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Havana.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Havana.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -102,8 +102,6 @@
 d(2003,4,6,5,0,0),
 d(2003,10,26,5,0,0),
 d(2004,4,4,5,0,0),
-d(2005,10,30,5,0,0),
-d(2006,4,2,5,0,0),
 d(2006,10,29,5,0,0),
 d(2007,4,1,5,0,0),
 d(2007,10,28,5,0,0),
@@ -326,8 +324,6 @@
 i(-18000,0,'CST'),
 i(-14400,3600,'CDT'),
 i(-18000,0,'CST'),
-i(-14400,3600,'CDT'),
-i(-18000,0,'CST'),
         ]
 
 Havana = Havana()

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Iqaluit.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Iqaluit.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Iqaluit.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -73,68 +73,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Managua.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Managua.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Managua.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -22,7 +22,7 @@
 d(1993,1,1,10,0,0),
 d(1998,12,1,5,0,0),
 d(2005,4,10,6,0,0),
-d(2005,9,18,5,0,0),
+d(2005,10,2,5,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Miquelon.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Miquelon.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Miquelon.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -52,68 +52,68 @@
 d(2005,10,30,4,0,0),
 d(2006,4,2,5,0,0),
 d(2006,10,29,4,0,0),
-d(2007,4,1,5,0,0),
-d(2007,10,28,4,0,0),
-d(2008,4,6,5,0,0),
-d(2008,10,26,4,0,0),
-d(2009,4,5,5,0,0),
-d(2009,10,25,4,0,0),
-d(2010,4,4,5,0,0),
-d(2010,10,31,4,0,0),
-d(2011,4,3,5,0,0),
-d(2011,10,30,4,0,0),
-d(2012,4,1,5,0,0),
-d(2012,10,28,4,0,0),
-d(2013,4,7,5,0,0),
-d(2013,10,27,4,0,0),
-d(2014,4,6,5,0,0),
-d(2014,10,26,4,0,0),
-d(2015,4,5,5,0,0),
-d(2015,10,25,4,0,0),
-d(2016,4,3,5,0,0),
-d(2016,10,30,4,0,0),
-d(2017,4,2,5,0,0),
-d(2017,10,29,4,0,0),
-d(2018,4,1,5,0,0),
-d(2018,10,28,4,0,0),
-d(2019,4,7,5,0,0),
-d(2019,10,27,4,0,0),
-d(2020,4,5,5,0,0),
-d(2020,10,25,4,0,0),
-d(2021,4,4,5,0,0),
-d(2021,10,31,4,0,0),
-d(2022,4,3,5,0,0),
-d(2022,10,30,4,0,0),
-d(2023,4,2,5,0,0),
-d(2023,10,29,4,0,0),
-d(2024,4,7,5,0,0),
-d(2024,10,27,4,0,0),
-d(2025,4,6,5,0,0),
-d(2025,10,26,4,0,0),
-d(2026,4,5,5,0,0),
-d(2026,10,25,4,0,0),
-d(2027,4,4,5,0,0),
-d(2027,10,31,4,0,0),
-d(2028,4,2,5,0,0),
-d(2028,10,29,4,0,0),
-d(2029,4,1,5,0,0),
-d(2029,10,28,4,0,0),
-d(2030,4,7,5,0,0),
-d(2030,10,27,4,0,0),
-d(2031,4,6,5,0,0),
-d(2031,10,26,4,0,0),
-d(2032,4,4,5,0,0),
-d(2032,10,31,4,0,0),
-d(2033,4,3,5,0,0),
-d(2033,10,30,4,0,0),
-d(2034,4,2,5,0,0),
-d(2034,10,29,4,0,0),
-d(2035,4,1,5,0,0),
-d(2035,10,28,4,0,0),
-d(2036,4,6,5,0,0),
-d(2036,10,26,4,0,0),
-d(2037,4,5,5,0,0),
-d(2037,10,25,4,0,0),
+d(2007,3,11,5,0,0),
+d(2007,11,4,4,0,0),
+d(2008,3,9,5,0,0),
+d(2008,11,2,4,0,0),
+d(2009,3,8,5,0,0),
+d(2009,11,1,4,0,0),
+d(2010,3,14,5,0,0),
+d(2010,11,7,4,0,0),
+d(2011,3,13,5,0,0),
+d(2011,11,6,4,0,0),
+d(2012,3,11,5,0,0),
+d(2012,11,4,4,0,0),
+d(2013,3,10,5,0,0),
+d(2013,11,3,4,0,0),
+d(2014,3,9,5,0,0),
+d(2014,11,2,4,0,0),
+d(2015,3,8,5,0,0),
+d(2015,11,1,4,0,0),
+d(2016,3,13,5,0,0),
+d(2016,11,6,4,0,0),
+d(2017,3,12,5,0,0),
+d(2017,11,5,4,0,0),
+d(2018,3,11,5,0,0),
+d(2018,11,4,4,0,0),
+d(2019,3,10,5,0,0),
+d(2019,11,3,4,0,0),
+d(2020,3,8,5,0,0),
+d(2020,11,1,4,0,0),
+d(2021,3,14,5,0,0),
+d(2021,11,7,4,0,0),
+d(2022,3,13,5,0,0),
+d(2022,11,6,4,0,0),
+d(2023,3,12,5,0,0),
+d(2023,11,5,4,0,0),
+d(2024,3,10,5,0,0),
+d(2024,11,3,4,0,0),
+d(2025,3,9,5,0,0),
+d(2025,11,2,4,0,0),
+d(2026,3,8,5,0,0),
+d(2026,11,1,4,0,0),
+d(2027,3,14,5,0,0),
+d(2027,11,7,4,0,0),
+d(2028,3,12,5,0,0),
+d(2028,11,5,4,0,0),
+d(2029,3,11,5,0,0),
+d(2029,11,4,4,0,0),
+d(2030,3,10,5,0,0),
+d(2030,11,3,4,0,0),
+d(2031,3,9,5,0,0),
+d(2031,11,2,4,0,0),
+d(2032,3,14,5,0,0),
+d(2032,11,7,4,0,0),
+d(2033,3,13,5,0,0),
+d(2033,11,6,4,0,0),
+d(2034,3,12,5,0,0),
+d(2034,11,5,4,0,0),
+d(2035,3,11,5,0,0),
+d(2035,11,4,4,0,0),
+d(2036,3,9,5,0,0),
+d(2036,11,2,4,0,0),
+d(2037,3,8,5,0,0),
+d(2037,11,1,4,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Montevideo.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Montevideo.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Montevideo.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -75,6 +75,8 @@
 d(1993,2,28,2,0,0),
 d(2004,9,19,3,0,0),
 d(2005,3,27,4,0,0),
+d(2005,10,9,5,0,0),
+d(2006,3,12,4,0,0),
         ]
 
     _transition_info = [
@@ -144,6 +146,8 @@
 i(-10800,0,'UYT'),
 i(-7200,3600,'UYST'),
 i(-10800,0,'UYT'),
+i(-7200,3600,'UYST'),
+i(-10800,0,'UYT'),
         ]
 
 Montevideo = Montevideo()

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Montreal.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Montreal.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Montreal.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -180,68 +180,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Nipigon.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Nipigon.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Nipigon.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -82,68 +82,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Pangnirtung.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Pangnirtung.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Pangnirtung.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -73,68 +73,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Rainy_River.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Rainy_River.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Rainy_River.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -82,68 +82,68 @@
 d(2005,10,30,7,0,0),
 d(2006,4,2,8,0,0),
 d(2006,10,29,7,0,0),
-d(2007,4,1,8,0,0),
-d(2007,10,28,7,0,0),
-d(2008,4,6,8,0,0),
-d(2008,10,26,7,0,0),
-d(2009,4,5,8,0,0),
-d(2009,10,25,7,0,0),
-d(2010,4,4,8,0,0),
-d(2010,10,31,7,0,0),
-d(2011,4,3,8,0,0),
-d(2011,10,30,7,0,0),
-d(2012,4,1,8,0,0),
-d(2012,10,28,7,0,0),
-d(2013,4,7,8,0,0),
-d(2013,10,27,7,0,0),
-d(2014,4,6,8,0,0),
-d(2014,10,26,7,0,0),
-d(2015,4,5,8,0,0),
-d(2015,10,25,7,0,0),
-d(2016,4,3,8,0,0),
-d(2016,10,30,7,0,0),
-d(2017,4,2,8,0,0),
-d(2017,10,29,7,0,0),
-d(2018,4,1,8,0,0),
-d(2018,10,28,7,0,0),
-d(2019,4,7,8,0,0),
-d(2019,10,27,7,0,0),
-d(2020,4,5,8,0,0),
-d(2020,10,25,7,0,0),
-d(2021,4,4,8,0,0),
-d(2021,10,31,7,0,0),
-d(2022,4,3,8,0,0),
-d(2022,10,30,7,0,0),
-d(2023,4,2,8,0,0),
-d(2023,10,29,7,0,0),
-d(2024,4,7,8,0,0),
-d(2024,10,27,7,0,0),
-d(2025,4,6,8,0,0),
-d(2025,10,26,7,0,0),
-d(2026,4,5,8,0,0),
-d(2026,10,25,7,0,0),
-d(2027,4,4,8,0,0),
-d(2027,10,31,7,0,0),
-d(2028,4,2,8,0,0),
-d(2028,10,29,7,0,0),
-d(2029,4,1,8,0,0),
-d(2029,10,28,7,0,0),
-d(2030,4,7,8,0,0),
-d(2030,10,27,7,0,0),
-d(2031,4,6,8,0,0),
-d(2031,10,26,7,0,0),
-d(2032,4,4,8,0,0),
-d(2032,10,31,7,0,0),
-d(2033,4,3,8,0,0),
-d(2033,10,30,7,0,0),
-d(2034,4,2,8,0,0),
-d(2034,10,29,7,0,0),
-d(2035,4,1,8,0,0),
-d(2035,10,28,7,0,0),
-d(2036,4,6,8,0,0),
-d(2036,10,26,7,0,0),
-d(2037,4,5,8,0,0),
-d(2037,10,25,7,0,0),
+d(2007,3,11,8,0,0),
+d(2007,11,4,7,0,0),
+d(2008,3,9,8,0,0),
+d(2008,11,2,7,0,0),
+d(2009,3,8,8,0,0),
+d(2009,11,1,7,0,0),
+d(2010,3,14,8,0,0),
+d(2010,11,7,7,0,0),
+d(2011,3,13,8,0,0),
+d(2011,11,6,7,0,0),
+d(2012,3,11,8,0,0),
+d(2012,11,4,7,0,0),
+d(2013,3,10,8,0,0),
+d(2013,11,3,7,0,0),
+d(2014,3,9,8,0,0),
+d(2014,11,2,7,0,0),
+d(2015,3,8,8,0,0),
+d(2015,11,1,7,0,0),
+d(2016,3,13,8,0,0),
+d(2016,11,6,7,0,0),
+d(2017,3,12,8,0,0),
+d(2017,11,5,7,0,0),
+d(2018,3,11,8,0,0),
+d(2018,11,4,7,0,0),
+d(2019,3,10,8,0,0),
+d(2019,11,3,7,0,0),
+d(2020,3,8,8,0,0),
+d(2020,11,1,7,0,0),
+d(2021,3,14,8,0,0),
+d(2021,11,7,7,0,0),
+d(2022,3,13,8,0,0),
+d(2022,11,6,7,0,0),
+d(2023,3,12,8,0,0),
+d(2023,11,5,7,0,0),
+d(2024,3,10,8,0,0),
+d(2024,11,3,7,0,0),
+d(2025,3,9,8,0,0),
+d(2025,11,2,7,0,0),
+d(2026,3,8,8,0,0),
+d(2026,11,1,7,0,0),
+d(2027,3,14,8,0,0),
+d(2027,11,7,7,0,0),
+d(2028,3,12,8,0,0),
+d(2028,11,5,7,0,0),
+d(2029,3,11,8,0,0),
+d(2029,11,4,7,0,0),
+d(2030,3,10,8,0,0),
+d(2030,11,3,7,0,0),
+d(2031,3,9,8,0,0),
+d(2031,11,2,7,0,0),
+d(2032,3,14,8,0,0),
+d(2032,11,7,7,0,0),
+d(2033,3,13,8,0,0),
+d(2033,11,6,7,0,0),
+d(2034,3,12,8,0,0),
+d(2034,11,5,7,0,0),
+d(2035,3,11,8,0,0),
+d(2035,11,4,7,0,0),
+d(2036,3,9,8,0,0),
+d(2036,11,2,7,0,0),
+d(2037,3,8,8,0,0),
+d(2037,11,1,7,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Rankin_Inlet.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Rankin_Inlet.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Rankin_Inlet.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -73,68 +73,68 @@
 d(2005,10,30,7,0,0),
 d(2006,4,2,8,0,0),
 d(2006,10,29,7,0,0),
-d(2007,4,1,8,0,0),
-d(2007,10,28,7,0,0),
-d(2008,4,6,8,0,0),
-d(2008,10,26,7,0,0),
-d(2009,4,5,8,0,0),
-d(2009,10,25,7,0,0),
-d(2010,4,4,8,0,0),
-d(2010,10,31,7,0,0),
-d(2011,4,3,8,0,0),
-d(2011,10,30,7,0,0),
-d(2012,4,1,8,0,0),
-d(2012,10,28,7,0,0),
-d(2013,4,7,8,0,0),
-d(2013,10,27,7,0,0),
-d(2014,4,6,8,0,0),
-d(2014,10,26,7,0,0),
-d(2015,4,5,8,0,0),
-d(2015,10,25,7,0,0),
-d(2016,4,3,8,0,0),
-d(2016,10,30,7,0,0),
-d(2017,4,2,8,0,0),
-d(2017,10,29,7,0,0),
-d(2018,4,1,8,0,0),
-d(2018,10,28,7,0,0),
-d(2019,4,7,8,0,0),
-d(2019,10,27,7,0,0),
-d(2020,4,5,8,0,0),
-d(2020,10,25,7,0,0),
-d(2021,4,4,8,0,0),
-d(2021,10,31,7,0,0),
-d(2022,4,3,8,0,0),
-d(2022,10,30,7,0,0),
-d(2023,4,2,8,0,0),
-d(2023,10,29,7,0,0),
-d(2024,4,7,8,0,0),
-d(2024,10,27,7,0,0),
-d(2025,4,6,8,0,0),
-d(2025,10,26,7,0,0),
-d(2026,4,5,8,0,0),
-d(2026,10,25,7,0,0),
-d(2027,4,4,8,0,0),
-d(2027,10,31,7,0,0),
-d(2028,4,2,8,0,0),
-d(2028,10,29,7,0,0),
-d(2029,4,1,8,0,0),
-d(2029,10,28,7,0,0),
-d(2030,4,7,8,0,0),
-d(2030,10,27,7,0,0),
-d(2031,4,6,8,0,0),
-d(2031,10,26,7,0,0),
-d(2032,4,4,8,0,0),
-d(2032,10,31,7,0,0),
-d(2033,4,3,8,0,0),
-d(2033,10,30,7,0,0),
-d(2034,4,2,8,0,0),
-d(2034,10,29,7,0,0),
-d(2035,4,1,8,0,0),
-d(2035,10,28,7,0,0),
-d(2036,4,6,8,0,0),
-d(2036,10,26,7,0,0),
-d(2037,4,5,8,0,0),
-d(2037,10,25,7,0,0),
+d(2007,3,11,8,0,0),
+d(2007,11,4,7,0,0),
+d(2008,3,9,8,0,0),
+d(2008,11,2,7,0,0),
+d(2009,3,8,8,0,0),
+d(2009,11,1,7,0,0),
+d(2010,3,14,8,0,0),
+d(2010,11,7,7,0,0),
+d(2011,3,13,8,0,0),
+d(2011,11,6,7,0,0),
+d(2012,3,11,8,0,0),
+d(2012,11,4,7,0,0),
+d(2013,3,10,8,0,0),
+d(2013,11,3,7,0,0),
+d(2014,3,9,8,0,0),
+d(2014,11,2,7,0,0),
+d(2015,3,8,8,0,0),
+d(2015,11,1,7,0,0),
+d(2016,3,13,8,0,0),
+d(2016,11,6,7,0,0),
+d(2017,3,12,8,0,0),
+d(2017,11,5,7,0,0),
+d(2018,3,11,8,0,0),
+d(2018,11,4,7,0,0),
+d(2019,3,10,8,0,0),
+d(2019,11,3,7,0,0),
+d(2020,3,8,8,0,0),
+d(2020,11,1,7,0,0),
+d(2021,3,14,8,0,0),
+d(2021,11,7,7,0,0),
+d(2022,3,13,8,0,0),
+d(2022,11,6,7,0,0),
+d(2023,3,12,8,0,0),
+d(2023,11,5,7,0,0),
+d(2024,3,10,8,0,0),
+d(2024,11,3,7,0,0),
+d(2025,3,9,8,0,0),
+d(2025,11,2,7,0,0),
+d(2026,3,8,8,0,0),
+d(2026,11,1,7,0,0),
+d(2027,3,14,8,0,0),
+d(2027,11,7,7,0,0),
+d(2028,3,12,8,0,0),
+d(2028,11,5,7,0,0),
+d(2029,3,11,8,0,0),
+d(2029,11,4,7,0,0),
+d(2030,3,10,8,0,0),
+d(2030,11,3,7,0,0),
+d(2031,3,9,8,0,0),
+d(2031,11,2,7,0,0),
+d(2032,3,14,8,0,0),
+d(2032,11,7,7,0,0),
+d(2033,3,13,8,0,0),
+d(2033,11,6,7,0,0),
+d(2034,3,12,8,0,0),
+d(2034,11,5,7,0,0),
+d(2035,3,11,8,0,0),
+d(2035,11,4,7,0,0),
+d(2036,3,9,8,0,0),
+d(2036,11,2,7,0,0),
+d(2037,3,8,8,0,0),
+d(2037,11,1,7,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Thunder_Bay.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Thunder_Bay.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Thunder_Bay.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -86,68 +86,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Toronto.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Toronto.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Toronto.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -180,68 +180,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/America/Winnipeg.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/America/Winnipeg.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/America/Winnipeg.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -133,68 +133,68 @@
 d(2005,10,30,8,0,0),
 d(2006,4,2,8,0,0),
 d(2006,10,29,8,0,0),
-d(2007,4,1,8,0,0),
-d(2007,10,28,8,0,0),
-d(2008,4,6,8,0,0),
-d(2008,10,26,8,0,0),
-d(2009,4,5,8,0,0),
-d(2009,10,25,8,0,0),
-d(2010,4,4,8,0,0),
-d(2010,10,31,8,0,0),
-d(2011,4,3,8,0,0),
-d(2011,10,30,8,0,0),
-d(2012,4,1,8,0,0),
-d(2012,10,28,8,0,0),
-d(2013,4,7,8,0,0),
-d(2013,10,27,8,0,0),
-d(2014,4,6,8,0,0),
-d(2014,10,26,8,0,0),
-d(2015,4,5,8,0,0),
-d(2015,10,25,8,0,0),
-d(2016,4,3,8,0,0),
-d(2016,10,30,8,0,0),
-d(2017,4,2,8,0,0),
-d(2017,10,29,8,0,0),
-d(2018,4,1,8,0,0),
-d(2018,10,28,8,0,0),
-d(2019,4,7,8,0,0),
-d(2019,10,27,8,0,0),
-d(2020,4,5,8,0,0),
-d(2020,10,25,8,0,0),
-d(2021,4,4,8,0,0),
-d(2021,10,31,8,0,0),
-d(2022,4,3,8,0,0),
-d(2022,10,30,8,0,0),
-d(2023,4,2,8,0,0),
-d(2023,10,29,8,0,0),
-d(2024,4,7,8,0,0),
-d(2024,10,27,8,0,0),
-d(2025,4,6,8,0,0),
-d(2025,10,26,8,0,0),
-d(2026,4,5,8,0,0),
-d(2026,10,25,8,0,0),
-d(2027,4,4,8,0,0),
-d(2027,10,31,8,0,0),
-d(2028,4,2,8,0,0),
-d(2028,10,29,8,0,0),
-d(2029,4,1,8,0,0),
-d(2029,10,28,8,0,0),
-d(2030,4,7,8,0,0),
-d(2030,10,27,8,0,0),
-d(2031,4,6,8,0,0),
-d(2031,10,26,8,0,0),
-d(2032,4,4,8,0,0),
-d(2032,10,31,8,0,0),
-d(2033,4,3,8,0,0),
-d(2033,10,30,8,0,0),
-d(2034,4,2,8,0,0),
-d(2034,10,29,8,0,0),
-d(2035,4,1,8,0,0),
-d(2035,10,28,8,0,0),
-d(2036,4,6,8,0,0),
-d(2036,10,26,8,0,0),
-d(2037,4,5,8,0,0),
-d(2037,10,25,8,0,0),
+d(2007,3,11,8,0,0),
+d(2007,11,4,8,0,0),
+d(2008,3,9,8,0,0),
+d(2008,11,2,8,0,0),
+d(2009,3,8,8,0,0),
+d(2009,11,1,8,0,0),
+d(2010,3,14,8,0,0),
+d(2010,11,7,8,0,0),
+d(2011,3,13,8,0,0),
+d(2011,11,6,8,0,0),
+d(2012,3,11,8,0,0),
+d(2012,11,4,8,0,0),
+d(2013,3,10,8,0,0),
+d(2013,11,3,8,0,0),
+d(2014,3,9,8,0,0),
+d(2014,11,2,8,0,0),
+d(2015,3,8,8,0,0),
+d(2015,11,1,8,0,0),
+d(2016,3,13,8,0,0),
+d(2016,11,6,8,0,0),
+d(2017,3,12,8,0,0),
+d(2017,11,5,8,0,0),
+d(2018,3,11,8,0,0),
+d(2018,11,4,8,0,0),
+d(2019,3,10,8,0,0),
+d(2019,11,3,8,0,0),
+d(2020,3,8,8,0,0),
+d(2020,11,1,8,0,0),
+d(2021,3,14,8,0,0),
+d(2021,11,7,8,0,0),
+d(2022,3,13,8,0,0),
+d(2022,11,6,8,0,0),
+d(2023,3,12,8,0,0),
+d(2023,11,5,8,0,0),
+d(2024,3,10,8,0,0),
+d(2024,11,3,8,0,0),
+d(2025,3,9,8,0,0),
+d(2025,11,2,8,0,0),
+d(2026,3,8,8,0,0),
+d(2026,11,1,8,0,0),
+d(2027,3,14,8,0,0),
+d(2027,11,7,8,0,0),
+d(2028,3,12,8,0,0),
+d(2028,11,5,8,0,0),
+d(2029,3,11,8,0,0),
+d(2029,11,4,8,0,0),
+d(2030,3,10,8,0,0),
+d(2030,11,3,8,0,0),
+d(2031,3,9,8,0,0),
+d(2031,11,2,8,0,0),
+d(2032,3,14,8,0,0),
+d(2032,11,7,8,0,0),
+d(2033,3,13,8,0,0),
+d(2033,11,6,8,0,0),
+d(2034,3,12,8,0,0),
+d(2034,11,5,8,0,0),
+d(2035,3,11,8,0,0),
+d(2035,11,4,8,0,0),
+d(2036,3,9,8,0,0),
+d(2036,11,2,8,0,0),
+d(2037,3,8,8,0,0),
+d(2037,11,1,8,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Asia/Amman.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Asia/Amman.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Asia/Amman.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -60,75 +60,75 @@
 d(2002,3,27,22,0,0),
 d(2002,9,25,22,0,0),
 d(2003,3,26,22,0,0),
-d(2003,9,24,22,0,0),
+d(2003,10,23,22,0,0),
 d(2004,3,24,22,0,0),
-d(2004,9,29,22,0,0),
+d(2004,10,14,22,0,0),
 d(2005,3,30,22,0,0),
-d(2005,9,28,22,0,0),
+d(2005,9,29,22,0,0),
 d(2006,3,29,22,0,0),
-d(2006,9,27,22,0,0),
+d(2006,9,28,22,0,0),
 d(2007,3,28,22,0,0),
-d(2007,9,26,22,0,0),
+d(2007,9,27,22,0,0),
 d(2008,3,26,22,0,0),
-d(2008,9,24,22,0,0),
+d(2008,9,25,22,0,0),
 d(2009,3,25,22,0,0),
-d(2009,9,23,22,0,0),
+d(2009,9,24,22,0,0),
 d(2010,3,24,22,0,0),
-d(2010,9,29,22,0,0),
+d(2010,9,23,22,0,0),
 d(2011,3,30,22,0,0),
-d(2011,9,28,22,0,0),
+d(2011,9,29,22,0,0),
 d(2012,3,28,22,0,0),
-d(2012,9,26,22,0,0),
+d(2012,9,27,22,0,0),
 d(2013,3,27,22,0,0),
-d(2013,9,25,22,0,0),
+d(2013,9,26,22,0,0),
 d(2014,3,26,22,0,0),
-d(2014,9,24,22,0,0),
+d(2014,9,25,22,0,0),
 d(2015,3,25,22,0,0),
-d(2015,9,23,22,0,0),
+d(2015,9,24,22,0,0),
 d(2016,3,30,22,0,0),
-d(2016,9,28,22,0,0),
+d(2016,9,29,22,0,0),
 d(2017,3,29,22,0,0),
-d(2017,9,27,22,0,0),
+d(2017,9,28,22,0,0),
 d(2018,3,28,22,0,0),
-d(2018,9,26,22,0,0),
+d(2018,9,27,22,0,0),
 d(2019,3,27,22,0,0),
-d(2019,9,25,22,0,0),
+d(2019,9,26,22,0,0),
 d(2020,3,25,22,0,0),
-d(2020,9,23,22,0,0),
+d(2020,9,24,22,0,0),
 d(2021,3,24,22,0,0),
-d(2021,9,29,22,0,0),
+d(2021,9,23,22,0,0),
 d(2022,3,30,22,0,0),
-d(2022,9,28,22,0,0),
+d(2022,9,29,22,0,0),
 d(2023,3,29,22,0,0),
-d(2023,9,27,22,0,0),
+d(2023,9,28,22,0,0),
 d(2024,3,27,22,0,0),
-d(2024,9,25,22,0,0),
+d(2024,9,26,22,0,0),
 d(2025,3,26,22,0,0),
-d(2025,9,24,22,0,0),
+d(2025,9,25,22,0,0),
 d(2026,3,25,22,0,0),
-d(2026,9,23,22,0,0),
+d(2026,9,24,22,0,0),
 d(2027,3,24,22,0,0),
-d(2027,9,29,22,0,0),
+d(2027,9,23,22,0,0),
 d(2028,3,29,22,0,0),
-d(2028,9,27,22,0,0),
+d(2028,9,28,22,0,0),
 d(2029,3,28,22,0,0),
-d(2029,9,26,22,0,0),
+d(2029,9,27,22,0,0),
 d(2030,3,27,22,0,0),
-d(2030,9,25,22,0,0),
+d(2030,9,26,22,0,0),
 d(2031,3,26,22,0,0),
-d(2031,9,24,22,0,0),
+d(2031,9,25,22,0,0),
 d(2032,3,24,22,0,0),
-d(2032,9,29,22,0,0),
+d(2032,9,23,22,0,0),
 d(2033,3,30,22,0,0),
-d(2033,9,28,22,0,0),
+d(2033,9,29,22,0,0),
 d(2034,3,29,22,0,0),
-d(2034,9,27,22,0,0),
+d(2034,9,28,22,0,0),
 d(2035,3,28,22,0,0),
-d(2035,9,26,22,0,0),
+d(2035,9,27,22,0,0),
 d(2036,3,26,22,0,0),
-d(2036,9,24,22,0,0),
+d(2036,9,25,22,0,0),
 d(2037,3,25,22,0,0),
-d(2037,9,23,22,0,0),
+d(2037,9,24,22,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Asia/Baku.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Asia/Baku.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Asia/Baku.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -41,88 +41,88 @@
 d(1996,3,31,1,0,0),
 d(1996,10,27,1,0,0),
 d(1996,12,31,20,0,0),
-d(1997,3,29,21,0,0),
-d(1997,10,25,20,0,0),
-d(1998,3,28,21,0,0),
-d(1998,10,24,20,0,0),
-d(1999,3,27,21,0,0),
-d(1999,10,30,20,0,0),
-d(2000,3,25,21,0,0),
-d(2000,10,28,20,0,0),
-d(2001,3,24,21,0,0),
-d(2001,10,27,20,0,0),
-d(2002,3,30,21,0,0),
-d(2002,10,26,20,0,0),
-d(2003,3,29,21,0,0),
-d(2003,10,25,20,0,0),
-d(2004,3,27,21,0,0),
-d(2004,10,30,20,0,0),
-d(2005,3,26,21,0,0),
-d(2005,10,29,20,0,0),
-d(2006,3,25,21,0,0),
-d(2006,10,28,20,0,0),
-d(2007,3,24,21,0,0),
-d(2007,10,27,20,0,0),
-d(2008,3,29,21,0,0),
-d(2008,10,25,20,0,0),
-d(2009,3,28,21,0,0),
-d(2009,10,24,20,0,0),
-d(2010,3,27,21,0,0),
-d(2010,10,30,20,0,0),
-d(2011,3,26,21,0,0),
-d(2011,10,29,20,0,0),
-d(2012,3,24,21,0,0),
-d(2012,10,27,20,0,0),
-d(2013,3,30,21,0,0),
-d(2013,10,26,20,0,0),
-d(2014,3,29,21,0,0),
-d(2014,10,25,20,0,0),
-d(2015,3,28,21,0,0),
-d(2015,10,24,20,0,0),
-d(2016,3,26,21,0,0),
-d(2016,10,29,20,0,0),
-d(2017,3,25,21,0,0),
-d(2017,10,28,20,0,0),
-d(2018,3,24,21,0,0),
-d(2018,10,27,20,0,0),
-d(2019,3,30,21,0,0),
-d(2019,10,26,20,0,0),
-d(2020,3,28,21,0,0),
-d(2020,10,24,20,0,0),
-d(2021,3,27,21,0,0),
-d(2021,10,30,20,0,0),
-d(2022,3,26,21,0,0),
-d(2022,10,29,20,0,0),
-d(2023,3,25,21,0,0),
-d(2023,10,28,20,0,0),
-d(2024,3,30,21,0,0),
-d(2024,10,26,20,0,0),
-d(2025,3,29,21,0,0),
-d(2025,10,25,20,0,0),
-d(2026,3,28,21,0,0),
-d(2026,10,24,20,0,0),
-d(2027,3,27,21,0,0),
-d(2027,10,30,20,0,0),
-d(2028,3,25,21,0,0),
-d(2028,10,28,20,0,0),
-d(2029,3,24,21,0,0),
-d(2029,10,27,20,0,0),
-d(2030,3,30,21,0,0),
-d(2030,10,26,20,0,0),
-d(2031,3,29,21,0,0),
-d(2031,10,25,20,0,0),
-d(2032,3,27,21,0,0),
-d(2032,10,30,20,0,0),
-d(2033,3,26,21,0,0),
-d(2033,10,29,20,0,0),
-d(2034,3,25,21,0,0),
-d(2034,10,28,20,0,0),
-d(2035,3,24,21,0,0),
-d(2035,10,27,20,0,0),
-d(2036,3,29,21,0,0),
-d(2036,10,25,20,0,0),
-d(2037,3,28,21,0,0),
-d(2037,10,24,20,0,0),
+d(1997,3,30,0,0,0),
+d(1997,10,26,0,0,0),
+d(1998,3,29,0,0,0),
+d(1998,10,25,0,0,0),
+d(1999,3,28,0,0,0),
+d(1999,10,31,0,0,0),
+d(2000,3,26,0,0,0),
+d(2000,10,29,0,0,0),
+d(2001,3,25,0,0,0),
+d(2001,10,28,0,0,0),
+d(2002,3,31,0,0,0),
+d(2002,10,27,0,0,0),
+d(2003,3,30,0,0,0),
+d(2003,10,26,0,0,0),
+d(2004,3,28,0,0,0),
+d(2004,10,31,0,0,0),
+d(2005,3,27,0,0,0),
+d(2005,10,30,0,0,0),
+d(2006,3,26,0,0,0),
+d(2006,10,29,0,0,0),
+d(2007,3,25,0,0,0),
+d(2007,10,28,0,0,0),
+d(2008,3,30,0,0,0),
+d(2008,10,26,0,0,0),
+d(2009,3,29,0,0,0),
+d(2009,10,25,0,0,0),
+d(2010,3,28,0,0,0),
+d(2010,10,31,0,0,0),
+d(2011,3,27,0,0,0),
+d(2011,10,30,0,0,0),
+d(2012,3,25,0,0,0),
+d(2012,10,28,0,0,0),
+d(2013,3,31,0,0,0),
+d(2013,10,27,0,0,0),
+d(2014,3,30,0,0,0),
+d(2014,10,26,0,0,0),
+d(2015,3,29,0,0,0),
+d(2015,10,25,0,0,0),
+d(2016,3,27,0,0,0),
+d(2016,10,30,0,0,0),
+d(2017,3,26,0,0,0),
+d(2017,10,29,0,0,0),
+d(2018,3,25,0,0,0),
+d(2018,10,28,0,0,0),
+d(2019,3,31,0,0,0),
+d(2019,10,27,0,0,0),
+d(2020,3,29,0,0,0),
+d(2020,10,25,0,0,0),
+d(2021,3,28,0,0,0),
+d(2021,10,31,0,0,0),
+d(2022,3,27,0,0,0),
+d(2022,10,30,0,0,0),
+d(2023,3,26,0,0,0),
+d(2023,10,29,0,0,0),
+d(2024,3,31,0,0,0),
+d(2024,10,27,0,0,0),
+d(2025,3,30,0,0,0),
+d(2025,10,26,0,0,0),
+d(2026,3,29,0,0,0),
+d(2026,10,25,0,0,0),
+d(2027,3,28,0,0,0),
+d(2027,10,31,0,0,0),
+d(2028,3,26,0,0,0),
+d(2028,10,29,0,0,0),
+d(2029,3,25,0,0,0),
+d(2029,10,28,0,0,0),
+d(2030,3,31,0,0,0),
+d(2030,10,27,0,0,0),
+d(2031,3,30,0,0,0),
+d(2031,10,26,0,0,0),
+d(2032,3,28,0,0,0),
+d(2032,10,31,0,0,0),
+d(2033,3,27,0,0,0),
+d(2033,10,30,0,0,0),
+d(2034,3,26,0,0,0),
+d(2034,10,29,0,0,0),
+d(2035,3,25,0,0,0),
+d(2035,10,28,0,0,0),
+d(2036,3,30,0,0,0),
+d(2036,10,26,0,0,0),
+d(2037,3,29,0,0,0),
+d(2037,10,25,0,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Asia/Bishkek.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Asia/Bishkek.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Asia/Bishkek.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -61,71 +61,7 @@
 d(2004,3,27,21,30,0),
 d(2004,10,30,20,30,0),
 d(2005,3,26,21,30,0),
-d(2005,10,29,20,30,0),
-d(2006,3,25,21,30,0),
-d(2006,10,28,20,30,0),
-d(2007,3,24,21,30,0),
-d(2007,10,27,20,30,0),
-d(2008,3,29,21,30,0),
-d(2008,10,25,20,30,0),
-d(2009,3,28,21,30,0),
-d(2009,10,24,20,30,0),
-d(2010,3,27,21,30,0),
-d(2010,10,30,20,30,0),
-d(2011,3,26,21,30,0),
-d(2011,10,29,20,30,0),
-d(2012,3,24,21,30,0),
-d(2012,10,27,20,30,0),
-d(2013,3,30,21,30,0),
-d(2013,10,26,20,30,0),
-d(2014,3,29,21,30,0),
-d(2014,10,25,20,30,0),
-d(2015,3,28,21,30,0),
-d(2015,10,24,20,30,0),
-d(2016,3,26,21,30,0),
-d(2016,10,29,20,30,0),
-d(2017,3,25,21,30,0),
-d(2017,10,28,20,30,0),
-d(2018,3,24,21,30,0),
-d(2018,10,27,20,30,0),
-d(2019,3,30,21,30,0),
-d(2019,10,26,20,30,0),
-d(2020,3,28,21,30,0),
-d(2020,10,24,20,30,0),
-d(2021,3,27,21,30,0),
-d(2021,10,30,20,30,0),
-d(2022,3,26,21,30,0),
-d(2022,10,29,20,30,0),
-d(2023,3,25,21,30,0),
-d(2023,10,28,20,30,0),
-d(2024,3,30,21,30,0),
-d(2024,10,26,20,30,0),
-d(2025,3,29,21,30,0),
-d(2025,10,25,20,30,0),
-d(2026,3,28,21,30,0),
-d(2026,10,24,20,30,0),
-d(2027,3,27,21,30,0),
-d(2027,10,30,20,30,0),
-d(2028,3,25,21,30,0),
-d(2028,10,28,20,30,0),
-d(2029,3,24,21,30,0),
-d(2029,10,27,20,30,0),
-d(2030,3,30,21,30,0),
-d(2030,10,26,20,30,0),
-d(2031,3,29,21,30,0),
-d(2031,10,25,20,30,0),
-d(2032,3,27,21,30,0),
-d(2032,10,30,20,30,0),
-d(2033,3,26,21,30,0),
-d(2033,10,29,20,30,0),
-d(2034,3,25,21,30,0),
-d(2034,10,28,20,30,0),
-d(2035,3,24,21,30,0),
-d(2035,10,27,20,30,0),
-d(2036,3,29,21,30,0),
-d(2036,10,25,20,30,0),
-d(2037,3,28,21,30,0),
-d(2037,10,24,20,30,0),
+d(2005,8,11,18,0,0),
         ]
 
     _transition_info = [
@@ -181,71 +117,7 @@
 i(21600,3600,'KGST'),
 i(18000,0,'KGT'),
 i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
-i(21600,3600,'KGST'),
-i(18000,0,'KGT'),
+i(21600,0,'KGT'),
         ]
 
 Bishkek = Bishkek()

Modified: Zope3/trunk/src/pytz/zoneinfo/Asia/Gaza.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Asia/Gaza.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Asia/Gaza.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -87,73 +87,73 @@
 d(2003,4,17,22,0,0),
 d(2003,10,16,21,0,0),
 d(2004,4,15,22,0,0),
-d(2004,10,14,21,0,0),
+d(2004,9,30,22,0,0),
 d(2005,4,14,22,0,0),
-d(2005,10,20,21,0,0),
+d(2005,10,3,22,0,0),
 d(2006,4,20,22,0,0),
-d(2006,10,19,21,0,0),
+d(2006,10,3,22,0,0),
 d(2007,4,19,22,0,0),
-d(2007,10,18,21,0,0),
+d(2007,10,3,22,0,0),
 d(2008,4,17,22,0,0),
-d(2008,10,16,21,0,0),
+d(2008,10,3,22,0,0),
 d(2009,4,16,22,0,0),
-d(2009,10,15,21,0,0),
+d(2009,10,3,22,0,0),
 d(2010,4,15,22,0,0),
-d(2010,10,14,21,0,0),
+d(2010,10,3,22,0,0),
 d(2011,4,14,22,0,0),
-d(2011,10,20,21,0,0),
+d(2011,10,3,22,0,0),
 d(2012,4,19,22,0,0),
-d(2012,10,18,21,0,0),
+d(2012,10,3,22,0,0),
 d(2013,4,18,22,0,0),
-d(2013,10,17,21,0,0),
+d(2013,10,3,22,0,0),
 d(2014,4,17,22,0,0),
-d(2014,10,16,21,0,0),
+d(2014,10,3,22,0,0),
 d(2015,4,16,22,0,0),
-d(2015,10,15,21,0,0),
+d(2015,10,3,22,0,0),
 d(2016,4,14,22,0,0),
-d(2016,10,20,21,0,0),
+d(2016,10,3,22,0,0),
 d(2017,4,20,22,0,0),
-d(2017,10,19,21,0,0),
+d(2017,10,3,22,0,0),
 d(2018,4,19,22,0,0),
-d(2018,10,18,21,0,0),
+d(2018,10,3,22,0,0),
 d(2019,4,18,22,0,0),
-d(2019,10,17,21,0,0),
+d(2019,10,3,22,0,0),
 d(2020,4,16,22,0,0),
-d(2020,10,15,21,0,0),
+d(2020,10,3,22,0,0),
 d(2021,4,15,22,0,0),
-d(2021,10,14,21,0,0),
+d(2021,10,3,22,0,0),
 d(2022,4,14,22,0,0),
-d(2022,10,20,21,0,0),
+d(2022,10,3,22,0,0),
 d(2023,4,20,22,0,0),
-d(2023,10,19,21,0,0),
+d(2023,10,3,22,0,0),
 d(2024,4,18,22,0,0),
-d(2024,10,17,21,0,0),
+d(2024,10,3,22,0,0),
 d(2025,4,17,22,0,0),
-d(2025,10,16,21,0,0),
+d(2025,10,3,22,0,0),
 d(2026,4,16,22,0,0),
-d(2026,10,15,21,0,0),
+d(2026,10,3,22,0,0),
 d(2027,4,15,22,0,0),
-d(2027,10,14,21,0,0),
+d(2027,10,3,22,0,0),
 d(2028,4,20,22,0,0),
-d(2028,10,19,21,0,0),
+d(2028,10,3,22,0,0),
 d(2029,4,19,22,0,0),
-d(2029,10,18,21,0,0),
+d(2029,10,3,22,0,0),
 d(2030,4,18,22,0,0),
-d(2030,10,17,21,0,0),
+d(2030,10,3,22,0,0),
 d(2031,4,17,22,0,0),
-d(2031,10,16,21,0,0),
+d(2031,10,3,22,0,0),
 d(2032,4,15,22,0,0),
-d(2032,10,14,21,0,0),
+d(2032,10,3,22,0,0),
 d(2033,4,14,22,0,0),
-d(2033,10,20,21,0,0),
+d(2033,10,3,22,0,0),
 d(2034,4,20,22,0,0),
-d(2034,10,19,21,0,0),
+d(2034,10,3,22,0,0),
 d(2035,4,19,22,0,0),
-d(2035,10,18,21,0,0),
+d(2035,10,3,22,0,0),
 d(2036,4,17,22,0,0),
-d(2036,10,16,21,0,0),
+d(2036,10,3,22,0,0),
 d(2037,4,16,22,0,0),
-d(2037,10,15,21,0,0),
+d(2037,10,3,22,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Asia/Tbilisi.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Asia/Tbilisi.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Asia/Tbilisi.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -63,71 +63,6 @@
 d(2004,6,26,19,0,0),
 d(2004,10,30,23,0,0),
 d(2005,3,26,23,0,0),
-d(2005,10,29,23,0,0),
-d(2006,3,25,23,0,0),
-d(2006,10,28,23,0,0),
-d(2007,3,24,23,0,0),
-d(2007,10,27,23,0,0),
-d(2008,3,29,23,0,0),
-d(2008,10,25,23,0,0),
-d(2009,3,28,23,0,0),
-d(2009,10,24,23,0,0),
-d(2010,3,27,23,0,0),
-d(2010,10,30,23,0,0),
-d(2011,3,26,23,0,0),
-d(2011,10,29,23,0,0),
-d(2012,3,24,23,0,0),
-d(2012,10,27,23,0,0),
-d(2013,3,30,23,0,0),
-d(2013,10,26,23,0,0),
-d(2014,3,29,23,0,0),
-d(2014,10,25,23,0,0),
-d(2015,3,28,23,0,0),
-d(2015,10,24,23,0,0),
-d(2016,3,26,23,0,0),
-d(2016,10,29,23,0,0),
-d(2017,3,25,23,0,0),
-d(2017,10,28,23,0,0),
-d(2018,3,24,23,0,0),
-d(2018,10,27,23,0,0),
-d(2019,3,30,23,0,0),
-d(2019,10,26,23,0,0),
-d(2020,3,28,23,0,0),
-d(2020,10,24,23,0,0),
-d(2021,3,27,23,0,0),
-d(2021,10,30,23,0,0),
-d(2022,3,26,23,0,0),
-d(2022,10,29,23,0,0),
-d(2023,3,25,23,0,0),
-d(2023,10,28,23,0,0),
-d(2024,3,30,23,0,0),
-d(2024,10,26,23,0,0),
-d(2025,3,29,23,0,0),
-d(2025,10,25,23,0,0),
-d(2026,3,28,23,0,0),
-d(2026,10,24,23,0,0),
-d(2027,3,27,23,0,0),
-d(2027,10,30,23,0,0),
-d(2028,3,25,23,0,0),
-d(2028,10,28,23,0,0),
-d(2029,3,24,23,0,0),
-d(2029,10,27,23,0,0),
-d(2030,3,30,23,0,0),
-d(2030,10,26,23,0,0),
-d(2031,3,29,23,0,0),
-d(2031,10,25,23,0,0),
-d(2032,3,27,23,0,0),
-d(2032,10,30,23,0,0),
-d(2033,3,26,23,0,0),
-d(2033,10,29,23,0,0),
-d(2034,3,25,23,0,0),
-d(2034,10,28,23,0,0),
-d(2035,3,24,23,0,0),
-d(2035,10,27,23,0,0),
-d(2036,3,29,23,0,0),
-d(2036,10,25,23,0,0),
-d(2037,3,28,23,0,0),
-d(2037,10,24,23,0,0),
         ]
 
     _transition_info = [
@@ -184,72 +119,7 @@
 i(18000,3600,'GEST'),
 i(14400,0,'GEST'),
 i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
-i(14400,3600,'GEST'),
-i(10800,0,'GET'),
+i(14400,0,'GET'),
         ]
 
 Tbilisi = Tbilisi()

Modified: Zope3/trunk/src/pytz/zoneinfo/CST6CDT.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/CST6CDT.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/CST6CDT.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -14,95 +14,9 @@
 d(1918,10,27,7,0,0),
 d(1919,3,30,8,0,0),
 d(1919,10,26,7,0,0),
-d(1920,6,13,8,0,0),
-d(1920,10,31,7,0,0),
-d(1921,3,27,8,0,0),
-d(1921,10,30,7,0,0),
-d(1922,4,30,8,0,0),
-d(1922,9,24,7,0,0),
-d(1923,4,29,8,0,0),
-d(1923,9,30,7,0,0),
-d(1924,4,27,8,0,0),
-d(1924,9,28,7,0,0),
-d(1925,4,26,8,0,0),
-d(1925,9,27,7,0,0),
-d(1926,4,25,8,0,0),
-d(1926,9,26,7,0,0),
-d(1927,4,24,8,0,0),
-d(1927,9,25,7,0,0),
-d(1928,4,29,8,0,0),
-d(1928,9,30,7,0,0),
-d(1929,4,28,8,0,0),
-d(1929,9,29,7,0,0),
-d(1930,4,27,8,0,0),
-d(1930,9,28,7,0,0),
-d(1931,4,26,8,0,0),
-d(1931,9,27,7,0,0),
-d(1932,4,24,8,0,0),
-d(1932,9,25,7,0,0),
-d(1933,4,30,8,0,0),
-d(1933,9,24,7,0,0),
-d(1934,4,29,8,0,0),
-d(1934,9,30,7,0,0),
-d(1935,4,28,8,0,0),
-d(1935,9,29,7,0,0),
-d(1936,3,1,8,0,0),
-d(1936,11,15,7,0,0),
-d(1937,4,25,8,0,0),
-d(1937,9,26,7,0,0),
-d(1938,4,24,8,0,0),
-d(1938,9,25,7,0,0),
-d(1939,4,30,8,0,0),
-d(1939,9,24,7,0,0),
-d(1940,4,28,8,0,0),
-d(1940,9,29,7,0,0),
-d(1941,4,27,8,0,0),
-d(1941,9,28,7,0,0),
 d(1942,2,9,8,0,0),
 d(1945,8,14,23,0,0),
 d(1945,9,30,7,0,0),
-d(1946,4,28,8,0,0),
-d(1946,9,29,7,0,0),
-d(1947,4,27,8,0,0),
-d(1947,9,28,7,0,0),
-d(1948,4,25,8,0,0),
-d(1948,9,26,7,0,0),
-d(1949,4,24,8,0,0),
-d(1949,9,25,7,0,0),
-d(1950,4,30,8,0,0),
-d(1950,9,24,7,0,0),
-d(1951,4,29,8,0,0),
-d(1951,9,30,7,0,0),
-d(1952,4,27,8,0,0),
-d(1952,9,28,7,0,0),
-d(1953,4,26,8,0,0),
-d(1953,9,27,7,0,0),
-d(1954,4,25,8,0,0),
-d(1954,9,26,7,0,0),
-d(1955,4,24,8,0,0),
-d(1955,10,30,7,0,0),
-d(1956,4,29,8,0,0),
-d(1956,10,28,7,0,0),
-d(1957,4,28,8,0,0),
-d(1957,10,27,7,0,0),
-d(1958,4,27,8,0,0),
-d(1958,10,26,7,0,0),
-d(1959,4,26,8,0,0),
-d(1959,10,25,7,0,0),
-d(1960,4,24,8,0,0),
-d(1960,10,30,7,0,0),
-d(1961,4,30,8,0,0),
-d(1961,10,29,7,0,0),
-d(1962,4,29,8,0,0),
-d(1962,10,28,7,0,0),
-d(1963,4,28,8,0,0),
-d(1963,10,27,7,0,0),
-d(1964,4,26,8,0,0),
-d(1964,10,25,7,0,0),
-d(1965,4,25,8,0,0),
-d(1965,10,31,7,0,0),
-d(1966,4,24,8,0,0),
-d(1966,10,30,7,0,0),
 d(1967,4,30,8,0,0),
 d(1967,10,29,7,0,0),
 d(1968,4,28,8,0,0),
@@ -253,50 +167,6 @@
 i(-21600,0,'CST'),
 i(-18000,3600,'CDT'),
 i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,0,'EST'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
 i(-18000,3600,'CWT'),
 i(-18000,3600,'CPT'),
 i(-21600,0,'CST'),
@@ -442,48 +312,6 @@
 i(-21600,0,'CST'),
 i(-18000,3600,'CDT'),
 i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
-i(-18000,3600,'CDT'),
-i(-21600,0,'CST'),
         ]
 
 CST6CDT = CST6CDT()

Modified: Zope3/trunk/src/pytz/zoneinfo/Canada/Atlantic.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Canada/Atlantic.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Canada/Atlantic.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -176,68 +176,68 @@
 d(2005,10,30,5,0,0),
 d(2006,4,2,6,0,0),
 d(2006,10,29,5,0,0),
-d(2007,4,1,6,0,0),
-d(2007,10,28,5,0,0),
-d(2008,4,6,6,0,0),
-d(2008,10,26,5,0,0),
-d(2009,4,5,6,0,0),
-d(2009,10,25,5,0,0),
-d(2010,4,4,6,0,0),
-d(2010,10,31,5,0,0),
-d(2011,4,3,6,0,0),
-d(2011,10,30,5,0,0),
-d(2012,4,1,6,0,0),
-d(2012,10,28,5,0,0),
-d(2013,4,7,6,0,0),
-d(2013,10,27,5,0,0),
-d(2014,4,6,6,0,0),
-d(2014,10,26,5,0,0),
-d(2015,4,5,6,0,0),
-d(2015,10,25,5,0,0),
-d(2016,4,3,6,0,0),
-d(2016,10,30,5,0,0),
-d(2017,4,2,6,0,0),
-d(2017,10,29,5,0,0),
-d(2018,4,1,6,0,0),
-d(2018,10,28,5,0,0),
-d(2019,4,7,6,0,0),
-d(2019,10,27,5,0,0),
-d(2020,4,5,6,0,0),
-d(2020,10,25,5,0,0),
-d(2021,4,4,6,0,0),
-d(2021,10,31,5,0,0),
-d(2022,4,3,6,0,0),
-d(2022,10,30,5,0,0),
-d(2023,4,2,6,0,0),
-d(2023,10,29,5,0,0),
-d(2024,4,7,6,0,0),
-d(2024,10,27,5,0,0),
-d(2025,4,6,6,0,0),
-d(2025,10,26,5,0,0),
-d(2026,4,5,6,0,0),
-d(2026,10,25,5,0,0),
-d(2027,4,4,6,0,0),
-d(2027,10,31,5,0,0),
-d(2028,4,2,6,0,0),
-d(2028,10,29,5,0,0),
-d(2029,4,1,6,0,0),
-d(2029,10,28,5,0,0),
-d(2030,4,7,6,0,0),
-d(2030,10,27,5,0,0),
-d(2031,4,6,6,0,0),
-d(2031,10,26,5,0,0),
-d(2032,4,4,6,0,0),
-d(2032,10,31,5,0,0),
-d(2033,4,3,6,0,0),
-d(2033,10,30,5,0,0),
-d(2034,4,2,6,0,0),
-d(2034,10,29,5,0,0),
-d(2035,4,1,6,0,0),
-d(2035,10,28,5,0,0),
-d(2036,4,6,6,0,0),
-d(2036,10,26,5,0,0),
-d(2037,4,5,6,0,0),
-d(2037,10,25,5,0,0),
+d(2007,3,11,6,0,0),
+d(2007,11,4,5,0,0),
+d(2008,3,9,6,0,0),
+d(2008,11,2,5,0,0),
+d(2009,3,8,6,0,0),
+d(2009,11,1,5,0,0),
+d(2010,3,14,6,0,0),
+d(2010,11,7,5,0,0),
+d(2011,3,13,6,0,0),
+d(2011,11,6,5,0,0),
+d(2012,3,11,6,0,0),
+d(2012,11,4,5,0,0),
+d(2013,3,10,6,0,0),
+d(2013,11,3,5,0,0),
+d(2014,3,9,6,0,0),
+d(2014,11,2,5,0,0),
+d(2015,3,8,6,0,0),
+d(2015,11,1,5,0,0),
+d(2016,3,13,6,0,0),
+d(2016,11,6,5,0,0),
+d(2017,3,12,6,0,0),
+d(2017,11,5,5,0,0),
+d(2018,3,11,6,0,0),
+d(2018,11,4,5,0,0),
+d(2019,3,10,6,0,0),
+d(2019,11,3,5,0,0),
+d(2020,3,8,6,0,0),
+d(2020,11,1,5,0,0),
+d(2021,3,14,6,0,0),
+d(2021,11,7,5,0,0),
+d(2022,3,13,6,0,0),
+d(2022,11,6,5,0,0),
+d(2023,3,12,6,0,0),
+d(2023,11,5,5,0,0),
+d(2024,3,10,6,0,0),
+d(2024,11,3,5,0,0),
+d(2025,3,9,6,0,0),
+d(2025,11,2,5,0,0),
+d(2026,3,8,6,0,0),
+d(2026,11,1,5,0,0),
+d(2027,3,14,6,0,0),
+d(2027,11,7,5,0,0),
+d(2028,3,12,6,0,0),
+d(2028,11,5,5,0,0),
+d(2029,3,11,6,0,0),
+d(2029,11,4,5,0,0),
+d(2030,3,10,6,0,0),
+d(2030,11,3,5,0,0),
+d(2031,3,9,6,0,0),
+d(2031,11,2,5,0,0),
+d(2032,3,14,6,0,0),
+d(2032,11,7,5,0,0),
+d(2033,3,13,6,0,0),
+d(2033,11,6,5,0,0),
+d(2034,3,12,6,0,0),
+d(2034,11,5,5,0,0),
+d(2035,3,11,6,0,0),
+d(2035,11,4,5,0,0),
+d(2036,3,9,6,0,0),
+d(2036,11,2,5,0,0),
+d(2037,3,8,6,0,0),
+d(2037,11,1,5,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Canada/Central.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Canada/Central.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Canada/Central.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -133,68 +133,68 @@
 d(2005,10,30,8,0,0),
 d(2006,4,2,8,0,0),
 d(2006,10,29,8,0,0),
-d(2007,4,1,8,0,0),
-d(2007,10,28,8,0,0),
-d(2008,4,6,8,0,0),
-d(2008,10,26,8,0,0),
-d(2009,4,5,8,0,0),
-d(2009,10,25,8,0,0),
-d(2010,4,4,8,0,0),
-d(2010,10,31,8,0,0),
-d(2011,4,3,8,0,0),
-d(2011,10,30,8,0,0),
-d(2012,4,1,8,0,0),
-d(2012,10,28,8,0,0),
-d(2013,4,7,8,0,0),
-d(2013,10,27,8,0,0),
-d(2014,4,6,8,0,0),
-d(2014,10,26,8,0,0),
-d(2015,4,5,8,0,0),
-d(2015,10,25,8,0,0),
-d(2016,4,3,8,0,0),
-d(2016,10,30,8,0,0),
-d(2017,4,2,8,0,0),
-d(2017,10,29,8,0,0),
-d(2018,4,1,8,0,0),
-d(2018,10,28,8,0,0),
-d(2019,4,7,8,0,0),
-d(2019,10,27,8,0,0),
-d(2020,4,5,8,0,0),
-d(2020,10,25,8,0,0),
-d(2021,4,4,8,0,0),
-d(2021,10,31,8,0,0),
-d(2022,4,3,8,0,0),
-d(2022,10,30,8,0,0),
-d(2023,4,2,8,0,0),
-d(2023,10,29,8,0,0),
-d(2024,4,7,8,0,0),
-d(2024,10,27,8,0,0),
-d(2025,4,6,8,0,0),
-d(2025,10,26,8,0,0),
-d(2026,4,5,8,0,0),
-d(2026,10,25,8,0,0),
-d(2027,4,4,8,0,0),
-d(2027,10,31,8,0,0),
-d(2028,4,2,8,0,0),
-d(2028,10,29,8,0,0),
-d(2029,4,1,8,0,0),
-d(2029,10,28,8,0,0),
-d(2030,4,7,8,0,0),
-d(2030,10,27,8,0,0),
-d(2031,4,6,8,0,0),
-d(2031,10,26,8,0,0),
-d(2032,4,4,8,0,0),
-d(2032,10,31,8,0,0),
-d(2033,4,3,8,0,0),
-d(2033,10,30,8,0,0),
-d(2034,4,2,8,0,0),
-d(2034,10,29,8,0,0),
-d(2035,4,1,8,0,0),
-d(2035,10,28,8,0,0),
-d(2036,4,6,8,0,0),
-d(2036,10,26,8,0,0),
-d(2037,4,5,8,0,0),
-d(2037,10,25,8,0,0),
+d(2007,3,11,8,0,0),
+d(2007,11,4,8,0,0),
+d(2008,3,9,8,0,0),
+d(2008,11,2,8,0,0),
+d(2009,3,8,8,0,0),
+d(2009,11,1,8,0,0),
+d(2010,3,14,8,0,0),
+d(2010,11,7,8,0,0),
+d(2011,3,13,8,0,0),
+d(2011,11,6,8,0,0),
+d(2012,3,11,8,0,0),
+d(2012,11,4,8,0,0),
+d(2013,3,10,8,0,0),
+d(2013,11,3,8,0,0),
+d(2014,3,9,8,0,0),
+d(2014,11,2,8,0,0),
+d(2015,3,8,8,0,0),
+d(2015,11,1,8,0,0),
+d(2016,3,13,8,0,0),
+d(2016,11,6,8,0,0),
+d(2017,3,12,8,0,0),
+d(2017,11,5,8,0,0),
+d(2018,3,11,8,0,0),
+d(2018,11,4,8,0,0),
+d(2019,3,10,8,0,0),
+d(2019,11,3,8,0,0),
+d(2020,3,8,8,0,0),
+d(2020,11,1,8,0,0),
+d(2021,3,14,8,0,0),
+d(2021,11,7,8,0,0),
+d(2022,3,13,8,0,0),
+d(2022,11,6,8,0,0),
+d(2023,3,12,8,0,0),
+d(2023,11,5,8,0,0),
+d(2024,3,10,8,0,0),
+d(2024,11,3,8,0,0),
+d(2025,3,9,8,0,0),
+d(2025,11,2,8,0,0),
+d(2026,3,8,8,0,0),
+d(2026,11,1,8,0,0),
+d(2027,3,14,8,0,0),
+d(2027,11,7,8,0,0),
+d(2028,3,12,8,0,0),
+d(2028,11,5,8,0,0),
+d(2029,3,11,8,0,0),
+d(2029,11,4,8,0,0),
+d(2030,3,10,8,0,0),
+d(2030,11,3,8,0,0),
+d(2031,3,9,8,0,0),
+d(2031,11,2,8,0,0),
+d(2032,3,14,8,0,0),
+d(2032,11,7,8,0,0),
+d(2033,3,13,8,0,0),
+d(2033,11,6,8,0,0),
+d(2034,3,12,8,0,0),
+d(2034,11,5,8,0,0),
+d(2035,3,11,8,0,0),
+d(2035,11,4,8,0,0),
+d(2036,3,9,8,0,0),
+d(2036,11,2,8,0,0),
+d(2037,3,8,8,0,0),
+d(2037,11,1,8,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Canada/Eastern.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Canada/Eastern.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Canada/Eastern.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -180,68 +180,68 @@
 d(2005,10,30,6,0,0),
 d(2006,4,2,7,0,0),
 d(2006,10,29,6,0,0),
-d(2007,4,1,7,0,0),
-d(2007,10,28,6,0,0),
-d(2008,4,6,7,0,0),
-d(2008,10,26,6,0,0),
-d(2009,4,5,7,0,0),
-d(2009,10,25,6,0,0),
-d(2010,4,4,7,0,0),
-d(2010,10,31,6,0,0),
-d(2011,4,3,7,0,0),
-d(2011,10,30,6,0,0),
-d(2012,4,1,7,0,0),
-d(2012,10,28,6,0,0),
-d(2013,4,7,7,0,0),
-d(2013,10,27,6,0,0),
-d(2014,4,6,7,0,0),
-d(2014,10,26,6,0,0),
-d(2015,4,5,7,0,0),
-d(2015,10,25,6,0,0),
-d(2016,4,3,7,0,0),
-d(2016,10,30,6,0,0),
-d(2017,4,2,7,0,0),
-d(2017,10,29,6,0,0),
-d(2018,4,1,7,0,0),
-d(2018,10,28,6,0,0),
-d(2019,4,7,7,0,0),
-d(2019,10,27,6,0,0),
-d(2020,4,5,7,0,0),
-d(2020,10,25,6,0,0),
-d(2021,4,4,7,0,0),
-d(2021,10,31,6,0,0),
-d(2022,4,3,7,0,0),
-d(2022,10,30,6,0,0),
-d(2023,4,2,7,0,0),
-d(2023,10,29,6,0,0),
-d(2024,4,7,7,0,0),
-d(2024,10,27,6,0,0),
-d(2025,4,6,7,0,0),
-d(2025,10,26,6,0,0),
-d(2026,4,5,7,0,0),
-d(2026,10,25,6,0,0),
-d(2027,4,4,7,0,0),
-d(2027,10,31,6,0,0),
-d(2028,4,2,7,0,0),
-d(2028,10,29,6,0,0),
-d(2029,4,1,7,0,0),
-d(2029,10,28,6,0,0),
-d(2030,4,7,7,0,0),
-d(2030,10,27,6,0,0),
-d(2031,4,6,7,0,0),
-d(2031,10,26,6,0,0),
-d(2032,4,4,7,0,0),
-d(2032,10,31,6,0,0),
-d(2033,4,3,7,0,0),
-d(2033,10,30,6,0,0),
-d(2034,4,2,7,0,0),
-d(2034,10,29,6,0,0),
-d(2035,4,1,7,0,0),
-d(2035,10,28,6,0,0),
-d(2036,4,6,7,0,0),
-d(2036,10,26,6,0,0),
-d(2037,4,5,7,0,0),
-d(2037,10,25,6,0,0),
+d(2007,3,11,7,0,0),
+d(2007,11,4,6,0,0),
+d(2008,3,9,7,0,0),
+d(2008,11,2,6,0,0),
+d(2009,3,8,7,0,0),
+d(2009,11,1,6,0,0),
+d(2010,3,14,7,0,0),
+d(2010,11,7,6,0,0),
+d(2011,3,13,7,0,0),
+d(2011,11,6,6,0,0),
+d(2012,3,11,7,0,0),
+d(2012,11,4,6,0,0),
+d(2013,3,10,7,0,0),
+d(2013,11,3,6,0,0),
+d(2014,3,9,7,0,0),
+d(2014,11,2,6,0,0),
+d(2015,3,8,7,0,0),
+d(2015,11,1,6,0,0),
+d(2016,3,13,7,0,0),
+d(2016,11,6,6,0,0),
+d(2017,3,12,7,0,0),
+d(2017,11,5,6,0,0),
+d(2018,3,11,7,0,0),
+d(2018,11,4,6,0,0),
+d(2019,3,10,7,0,0),
+d(2019,11,3,6,0,0),
+d(2020,3,8,7,0,0),
+d(2020,11,1,6,0,0),
+d(2021,3,14,7,0,0),
+d(2021,11,7,6,0,0),
+d(2022,3,13,7,0,0),
+d(2022,11,6,6,0,0),
+d(2023,3,12,7,0,0),
+d(2023,11,5,6,0,0),
+d(2024,3,10,7,0,0),
+d(2024,11,3,6,0,0),
+d(2025,3,9,7,0,0),
+d(2025,11,2,6,0,0),
+d(2026,3,8,7,0,0),
+d(2026,11,1,6,0,0),
+d(2027,3,14,7,0,0),
+d(2027,11,7,6,0,0),
+d(2028,3,12,7,0,0),
+d(2028,11,5,6,0,0),
+d(2029,3,11,7,0,0),
+d(2029,11,4,6,0,0),
+d(2030,3,10,7,0,0),
+d(2030,11,3,6,0,0),
+d(2031,3,9,7,0,0),
+d(2031,11,2,6,0,0),
+d(2032,3,14,7,0,0),
+d(2032,11,7,6,0,0),
+d(2033,3,13,7,0,0),
+d(2033,11,6,6,0,0),
+d(2034,3,12,7,0,0),
+d(2034,11,5,6,0,0),
+d(2035,3,11,7,0,0),
+d(2035,11,4,6,0,0),
+d(2036,3,9,7,0,0),
+d(2036,11,2,6,0,0),
+d(2037,3,8,7,0,0),
+d(2037,11,1,6,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/trunk/src/pytz/zoneinfo/Cuba.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/Cuba.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/Cuba.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -102,8 +102,6 @@
 d(2003,4,6,5,0,0),
 d(2003,10,26,5,0,0),
 d(2004,4,4,5,0,0),
-d(2005,10,30,5,0,0),
-d(2006,4,2,5,0,0),
 d(2006,10,29,5,0,0),
 d(2007,4,1,5,0,0),
 d(2007,10,28,5,0,0),
@@ -326,8 +324,6 @@
 i(-18000,0,'CST'),
 i(-14400,3600,'CDT'),
 i(-18000,0,'CST'),
-i(-14400,3600,'CDT'),
-i(-18000,0,'CST'),
         ]
 
 Cuba = Cuba()

Modified: Zope3/trunk/src/pytz/zoneinfo/EST.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/EST.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/EST.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -1,22 +1,12 @@
 '''tzinfo timezone information for EST.'''
-from pytz.tzinfo import DstTzInfo
-from pytz.tzinfo import memorized_datetime as d
-from pytz.tzinfo import memorized_ttinfo as i
+from pytz.tzinfo import StaticTzInfo
+from pytz.tzinfo import memorized_timedelta as timedelta
 
-class EST(DstTzInfo):
+class EST(StaticTzInfo):
     '''EST timezone definition. See datetime.tzinfo for details'''
-
     zone = 'EST'
+    _utcoffset = timedelta(seconds=-18000)
+    _tzname = 'EST'
 
-    _utc_transition_times = [
-d(1,1,1,0,0,0),
-d(1908,4,22,5,19,36),
-        ]
-
-    _transition_info = [
-i(-19200,0,'CMT'),
-i(-18000,0,'EST'),
-        ]
-
 EST = EST()
 

Modified: Zope3/trunk/src/pytz/zoneinfo/EST5EDT.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/EST5EDT.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/EST5EDT.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -14,95 +14,9 @@
 d(1918,10,27,6,0,0),
 d(1919,3,30,7,0,0),
 d(1919,10,26,6,0,0),
-d(1920,3,28,7,0,0),
-d(1920,10,31,6,0,0),
-d(1921,4,24,7,0,0),
-d(1921,9,25,6,0,0),
-d(1922,4,30,7,0,0),
-d(1922,9,24,6,0,0),
-d(1923,4,29,7,0,0),
-d(1923,9,30,6,0,0),
-d(1924,4,27,7,0,0),
-d(1924,9,28,6,0,0),
-d(1925,4,26,7,0,0),
-d(1925,9,27,6,0,0),
-d(1926,4,25,7,0,0),
-d(1926,9,26,6,0,0),
-d(1927,4,24,7,0,0),
-d(1927,9,25,6,0,0),
-d(1928,4,29,7,0,0),
-d(1928,9,30,6,0,0),
-d(1929,4,28,7,0,0),
-d(1929,9,29,6,0,0),
-d(1930,4,27,7,0,0),
-d(1930,9,28,6,0,0),
-d(1931,4,26,7,0,0),
-d(1931,9,27,6,0,0),
-d(1932,4,24,7,0,0),
-d(1932,9,25,6,0,0),
-d(1933,4,30,7,0,0),
-d(1933,9,24,6,0,0),
-d(1934,4,29,7,0,0),
-d(1934,9,30,6,0,0),
-d(1935,4,28,7,0,0),
-d(1935,9,29,6,0,0),
-d(1936,4,26,7,0,0),
-d(1936,9,27,6,0,0),
-d(1937,4,25,7,0,0),
-d(1937,9,26,6,0,0),
-d(1938,4,24,7,0,0),
-d(1938,9,25,6,0,0),
-d(1939,4,30,7,0,0),
-d(1939,9,24,6,0,0),
-d(1940,4,28,7,0,0),
-d(1940,9,29,6,0,0),
-d(1941,4,27,7,0,0),
-d(1941,9,28,6,0,0),
 d(1942,2,9,7,0,0),
 d(1945,8,14,23,0,0),
 d(1945,9,30,6,0,0),
-d(1946,4,28,7,0,0),
-d(1946,9,29,6,0,0),
-d(1947,4,27,7,0,0),
-d(1947,9,28,6,0,0),
-d(1948,4,25,7,0,0),
-d(1948,9,26,6,0,0),
-d(1949,4,24,7,0,0),
-d(1949,9,25,6,0,0),
-d(1950,4,30,7,0,0),
-d(1950,9,24,6,0,0),
-d(1951,4,29,7,0,0),
-d(1951,9,30,6,0,0),
-d(1952,4,27,7,0,0),
-d(1952,9,28,6,0,0),
-d(1953,4,26,7,0,0),
-d(1953,9,27,6,0,0),
-d(1954,4,25,7,0,0),
-d(1954,9,26,6,0,0),
-d(1955,4,24,7,0,0),
-d(1955,10,30,6,0,0),
-d(1956,4,29,7,0,0),
-d(1956,10,28,6,0,0),
-d(1957,4,28,7,0,0),
-d(1957,10,27,6,0,0),
-d(1958,4,27,7,0,0),
-d(1958,10,26,6,0,0),
-d(1959,4,26,7,0,0),
-d(1959,10,25,6,0,0),
-d(1960,4,24,7,0,0),
-d(1960,10,30,6,0,0),
-d(1961,4,30,7,0,0),
-d(1961,10,29,6,0,0),
-d(1962,4,29,7,0,0),
-d(1962,10,28,6,0,0),
-d(1963,4,28,7,0,0),
-d(1963,10,27,6,0,0),
-d(1964,4,26,7,0,0),
-d(1964,10,25,6,0,0),
-d(1965,4,25,7,0,0),
-d(1965,10,31,6,0,0),
-d(1966,4,24,7,0,0),
-d(1966,10,30,6,0,0),
 d(1967,4,30,7,0,0),
 d(1967,10,29,6,0,0),
 d(1968,4,28,7,0,0),
@@ -253,50 +167,6 @@
 i(-18000,0,'EST'),
 i(-14400,3600,'EDT'),
 i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
 i(-14400,3600,'EWT'),
 i(-14400,3600,'EPT'),
 i(-18000,0,'EST'),
@@ -442,48 +312,6 @@
 i(-18000,0,'EST'),
 i(-14400,3600,'EDT'),
 i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
         ]
 
 EST5EDT = EST5EDT()

Modified: Zope3/trunk/src/pytz/zoneinfo/HST.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/HST.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/HST.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -1,32 +1,12 @@
 '''tzinfo timezone information for HST.'''
-from pytz.tzinfo import DstTzInfo
-from pytz.tzinfo import memorized_datetime as d
-from pytz.tzinfo import memorized_ttinfo as i
+from pytz.tzinfo import StaticTzInfo
+from pytz.tzinfo import memorized_timedelta as timedelta
 
-class HST(DstTzInfo):
+class HST(StaticTzInfo):
     '''HST timezone definition. See datetime.tzinfo for details'''
-
     zone = 'HST'
+    _utcoffset = timedelta(seconds=-36000)
+    _tzname = 'HST'
 
-    _utc_transition_times = [
-d(1,1,1,0,0,0),
-d(1933,4,30,12,30,0),
-d(1933,5,21,11,30,0),
-d(1942,2,9,12,30,0),
-d(1945,8,14,23,0,0),
-d(1945,9,30,11,30,0),
-d(1947,6,8,12,30,0),
-        ]
-
-    _transition_info = [
-i(-37800,0,'HST'),
-i(-34200,3600,'HDT'),
-i(-37800,0,'HST'),
-i(-34200,3600,'HWT'),
-i(-34200,3600,'HPT'),
-i(-37800,0,'HST'),
-i(-36000,0,'HST'),
-        ]
-
 HST = HST()
 

Modified: Zope3/trunk/src/pytz/zoneinfo/MST.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/MST.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/MST.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -1,40 +1,12 @@
 '''tzinfo timezone information for MST.'''
-from pytz.tzinfo import DstTzInfo
-from pytz.tzinfo import memorized_datetime as d
-from pytz.tzinfo import memorized_ttinfo as i
+from pytz.tzinfo import StaticTzInfo
+from pytz.tzinfo import memorized_timedelta as timedelta
 
-class MST(DstTzInfo):
+class MST(StaticTzInfo):
     '''MST timezone definition. See datetime.tzinfo for details'''
-
     zone = 'MST'
+    _utcoffset = timedelta(seconds=-25200)
+    _tzname = 'MST'
 
-    _utc_transition_times = [
-d(1,1,1,0,0,0),
-d(1918,3,31,9,0,0),
-d(1918,10,27,8,0,0),
-d(1919,3,30,9,0,0),
-d(1919,10,26,8,0,0),
-d(1942,2,9,9,0,0),
-d(1944,1,1,6,1,0),
-d(1944,4,1,7,1,0),
-d(1944,10,1,6,1,0),
-d(1967,4,30,9,0,0),
-d(1967,10,29,8,0,0),
-        ]
-
-    _transition_info = [
-i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
-i(-21600,3600,'MWT'),
-i(-25200,0,'MST'),
-i(-21600,3600,'MWT'),
-i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
-        ]
-
 MST = MST()
 

Modified: Zope3/trunk/src/pytz/zoneinfo/MST7MDT.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/MST7MDT.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/MST7MDT.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -14,17 +14,9 @@
 d(1918,10,27,8,0,0),
 d(1919,3,30,9,0,0),
 d(1919,10,26,8,0,0),
-d(1920,3,28,9,0,0),
-d(1920,10,31,8,0,0),
-d(1921,3,27,9,0,0),
-d(1921,5,22,8,0,0),
 d(1942,2,9,9,0,0),
 d(1945,8,14,23,0,0),
 d(1945,9,30,8,0,0),
-d(1965,4,25,9,0,0),
-d(1965,10,31,8,0,0),
-d(1966,4,24,9,0,0),
-d(1966,10,30,8,0,0),
 d(1967,4,30,9,0,0),
 d(1967,10,29,8,0,0),
 d(1968,4,28,9,0,0),
@@ -175,10 +167,6 @@
 i(-25200,0,'MST'),
 i(-21600,3600,'MDT'),
 i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
 i(-21600,3600,'MWT'),
 i(-21600,3600,'MPT'),
 i(-25200,0,'MST'),
@@ -324,10 +312,6 @@
 i(-25200,0,'MST'),
 i(-21600,3600,'MDT'),
 i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
-i(-21600,3600,'MDT'),
-i(-25200,0,'MST'),
         ]
 
 MST7MDT = MST7MDT()

Modified: Zope3/trunk/src/pytz/zoneinfo/PST8PDT.py
===================================================================
--- Zope3/trunk/src/pytz/zoneinfo/PST8PDT.py	2006-01-09 08:01:47 UTC (rev 41237)
+++ Zope3/trunk/src/pytz/zoneinfo/PST8PDT.py	2006-01-09 10:04:49 UTC (rev 41238)
@@ -17,42 +17,6 @@
 d(1942,2,9,10,0,0),
 d(1945,8,14,23,0,0),
 d(1945,9,30,9,0,0),
-d(1948,3,14,10,0,0),
-d(1949,1,1,9,0,0),
-d(1950,4,30,10,0,0),
-d(1950,9,24,9,0,0),
-d(1951,4,29,10,0,0),
-d(1951,9,30,9,0,0),
-d(1952,4,27,10,0,0),
-d(1952,9,28,9,0,0),
-d(1953,4,26,10,0,0),
-d(1953,9,27,9,0,0),
-d(1954,4,25,10,0,0),
-d(1954,9,26,9,0,0),
-d(1955,4,24,10,0,0),
-d(1955,9,25,9,0,0),
-d(1956,4,29,10,0,0),
-d(1956,9,30,9,0,0),
-d(1957,4,28,10,0,0),
-d(1957,9,29,9,0,0),
-d(1958,4,27,10,0,0),
-d(1958,9,28,9,0,0),
-d(1959,4,26,10,0,0),
-d(1959,9,27,9,0,0),
-d(1960,4,24,10,0,0),
-d(1960,9,25,9,0,0),
-d(1961,4,30,10,0,0),
-d(1961,9,24,9,0,0),
-d(1962,4,29,10,0,0),
-d(1962,10,28,9,0,0),
-d(1963,4,28,10,0,0),
-d(1963,10,27,9,0,0),
-d(1964,4,26,10,0,0),
-d(1964,10,25,9,0,0),
-d(1965,4,25,10,0,0),
-d(1965,10,31,9,0,0),
-d(1966,4,24,10,0,0),
-d(1966,10,30,9,0,0),
 d(1967,4,30,10,0,0),
 d(1967,10,29,9,0,0),
 d(1968,4,28,10,0,0),
@@ -348,42 +312,6 @@
 i(-28800,0,'PST'),
 i(-25200,3600,'PDT'),
 i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
-i(-25200,3600,'PDT'),
-i(-28800,0,'PST'),
         ]
 
 PST8PDT = PST8PDT()



More information about the Zope3-Checkins mailing list