[Zope3-checkins] SVN: Zope3/branches/Zope-3.1/src/ Merge the pytz upgrades and related i18n fixes that Stuart Bishop did on the

Gary Poster gary at zope.com
Wed Sep 7 14:27:37 EDT 2005


Log message for revision 38349:
  Merge the pytz upgrades and related i18n fixes that Stuart Bishop did on the
  trunk (revisions 38302, 38333, and 38336)
  
  

Changed:
  U   Zope3/branches/Zope-3.1/src/pytz/README.txt
  U   Zope3/branches/Zope-3.1/src/pytz/__init__.py
  U   Zope3/branches/Zope-3.1/src/pytz/tests/test_tzinfo.py
  A   Zope3/branches/Zope-3.1/src/pytz/zone.tab
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Timbuktu.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Tunis.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Adak.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Anchorage.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Atka.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Boise.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Chicago.py
  A   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Coral_Harbour.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Denver.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Detroit.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Fort_Wayne.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Indianapolis.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Knox.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Marengo.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Vevay.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indianapolis.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Juneau.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Louisville.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Monticello.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Knox_IN.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Los_Angeles.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Louisville.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Managua.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Menominee.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/New_York.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Nome.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/North_Dakota/Center.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Shiprock.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Yakutat.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Aqtau.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Dili.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Oral.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Tokyo.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/ACT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Adelaide.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Broken_Hill.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Canberra.py
  A   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Currie.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Hobart.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/LHI.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Lord_Howe.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Melbourne.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/NSW.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/South.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Sydney.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Tasmania.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Victoria.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Yancowinna.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/CST6CDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST5EDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Belfast.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Warsaw.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Japan.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/MST7MDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Navajo.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/PST8PDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Pacific/Yap.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Poland.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/CST6CDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5EDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/MST7MDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/PST8PDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/YST9YDT.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Alaska.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Aleutian.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Central.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/East_minus_Indiana.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Eastern.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Indiana_minus_Starke.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Michigan.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Mountain.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific_minus_New.py
  U   Zope3/branches/Zope-3.1/src/pytz/zoneinfo/posixrules.py
  U   Zope3/branches/Zope-3.1/src/zope/i18n/format.py
  U   Zope3/branches/Zope-3.1/src/zope/i18n/tests/test_formats.py

-=-
Modified: Zope3/branches/Zope-3.1/src/pytz/README.txt
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/README.txt	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/README.txt	2005-09-07 18:27:36 UTC (rev 38349)
@@ -194,6 +194,39 @@
 computers that move roam through multiple timezones.
 
 
+Helpers
+~~~~~~~
+
+There are two lists of timezones provided.
+
+`all_timezones` is the exhaustive list of the timezone names that can be used.
+
+>>> from pytz import all_timezones
+>>> len(all_timezones) >= 548
+True
+>>> 'Etc/Greenwich' in all_timezones
+True
+
+`common_timezones` is a list of useful, current timezones. It doesn't
+contain deprecated zones or historical zones. It is also a sequence of
+strings.
+
+>>> from pytz import common_timezones
+>>> len(common_timezones) < len(all_timezones)
+True
+>>> 'Etc/Greenwich' in common_timezones
+False
+
+You can also retrieve lists of timezones used by particular countries
+using the `country_timezones()` method. It requires an ISO-3166 two letter
+country code.
+
+>>> from pytz import country_timezones
+>>> country_timezones('ch')
+['Europe/Zurich']
+>>> country_timezones('CH')
+['Europe/Zurich']
+
 License
 ~~~~~~~
 

Modified: Zope3/branches/Zope-3.1/src/pytz/__init__.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/__init__.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/__init__.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -9,7 +9,7 @@
 '''
 
 # The Olson database has historically been updated about 4 times a year
-OLSON_VERSION = '2005k'
+OLSON_VERSION = '2005m'
 VERSION = OLSON_VERSION
 #VERSION = OLSON_VERSION + '.2'
 __version__ = OLSON_VERSION
@@ -18,10 +18,10 @@
 
 __all__ = [
     'timezone', 'all_timezones', 'common_timezones', 'utc',
-    'AmbiguousTimeError',
+    'AmbiguousTimeError', 'country_timezones',
     ]
 
-import sys, datetime
+import sys, datetime, os.path
 from tzinfo import AmbiguousTimeError, unpickler
 
 def timezone(zone):
@@ -163,7 +163,35 @@
     return unpickler(*args)
 _p.__safe_for_unpickling__ = True
 
+_country_timezones_cache = {}
 
+def country_timezones(iso3166_code):
+    """Return a list of timezones used in a particular country.
+
+    iso3166_code is the two letter code used to identify the country.
+
+    >>> country_timezones('ch')
+    ['Europe/Zurich']
+    >>> country_timezones('CH')
+    ['Europe/Zurich']
+    >>> country_timezones('XXX')
+    Traceback (most recent call last):
+    ...
+    KeyError: 'XXX'
+    """
+    iso3166_code = iso3166_code.upper()
+    if not _country_timezones_cache:
+        zone_tab_name = os.path.join(os.path.dirname(__file__), 'zone.tab')
+        for line in open(zone_tab_name):
+            if line.startswith('#'):
+                continue
+            code, coordinates, zone = line.split(None, 4)[:3]
+            try:
+                _country_timezones_cache[code].append(zone)
+            except KeyError:
+                _country_timezones_cache[code] = [zone]
+    return _country_timezones_cache[iso3166_code]
+
 def _test():
     import doctest, os, sys
     sys.path.insert(0, os.pardir)
@@ -251,6 +279,7 @@
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
+ 'America/Coral_Harbour',
  'America/Cordoba',
  'America/Costa_Rica',
  'America/Cuiaba',
@@ -458,6 +487,7 @@
  'Australia/Brisbane',
  'Australia/Broken_Hill',
  'Australia/Canberra',
+ 'Australia/Currie',
  'Australia/Darwin',
  'Australia/Hobart',
  'Australia/LHI',
@@ -701,6 +731,7 @@
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
+ 'America/Coral_Harbour',
  'America/Cordoba',
  'America/Costa_Rica',
  'America/Cuiaba',
@@ -915,6 +946,7 @@
  'Australia/Brisbane',
  'Australia/Broken_Hill',
  'Australia/Canberra',
+ 'Australia/Currie',
  'Australia/Darwin',
  'Australia/Hobart',
  'Australia/LHI',

Modified: Zope3/branches/Zope-3.1/src/pytz/tests/test_tzinfo.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/tests/test_tzinfo.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/tests/test_tzinfo.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -26,8 +26,9 @@
 
     def testVersion(self):
         # Ensuring the correct version of pytz has been loaded
-        self.failUnlessEqual('2005k', pytz.__version__,
-                'Incorrect pytz version loaded. Import path is stuffed.'
+        self.failUnlessEqual('2005m', pytz.__version__,
+                'Incorrect pytz version loaded. Import path is stuffed '
+                'or this test needs updating.'
                 )
 
     def testGMT(self):

Copied: Zope3/branches/Zope-3.1/src/pytz/zone.tab (from rev 38333, Zope3/trunk/src/pytz/zone.tab)


Property changes on: Zope3/branches/Zope-3.1/src/pytz/zone.tab
___________________________________________________________________
Name: svn:keywords "LastChangedDate Author Id LastChangedRevision LastChangedBy HeadURL"
   + 
Name: svn:eol-style
   + native

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Timbuktu.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Timbuktu.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Timbuktu.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -10,12 +10,16 @@
 
     _utc_transition_times = [
 d(1,1,1,0,0,0),
-d(1912,1,1,0,12,4),
+d(1912,1,1,0,32,0),
+d(1934,2,26,0,0,0),
+d(1960,6,20,1,0,0),
         ]
 
     _transition_info = [
-i(-720,0,'LMT'),
+i(-1920,0,'LMT'),
 i(0,0,'GMT'),
+i(-3600,0,'WAT'),
+i(0,0,'GMT'),
         ]
 
 Timbuktu = Timbuktu()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Tunis.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Tunis.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Africa/Tunis.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -35,6 +35,8 @@
 d(1989,9,23,23,0,0),
 d(1990,4,30,23,0,0),
 d(1990,9,29,23,0,0),
+d(2005,4,30,23,0,0),
+d(2005,9,30,0,0,0),
         ]
 
     _transition_info = [
@@ -64,6 +66,8 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(7200,3600,'CEST'),
+i(3600,0,'CET'),
         ]
 
 Tunis = Tunis()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Adak.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Adak.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Adak.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,11,0,0),
 d(2006,4,2,12,0,0),
 d(2006,10,29,11,0,0),
-d(2007,4,1,12,0,0),
-d(2007,10,28,11,0,0),
-d(2008,4,6,12,0,0),
-d(2008,10,26,11,0,0),
-d(2009,4,5,12,0,0),
-d(2009,10,25,11,0,0),
-d(2010,4,4,12,0,0),
-d(2010,10,31,11,0,0),
-d(2011,4,3,12,0,0),
-d(2011,10,30,11,0,0),
-d(2012,4,1,12,0,0),
-d(2012,10,28,11,0,0),
-d(2013,4,7,12,0,0),
-d(2013,10,27,11,0,0),
-d(2014,4,6,12,0,0),
-d(2014,10,26,11,0,0),
-d(2015,4,5,12,0,0),
-d(2015,10,25,11,0,0),
-d(2016,4,3,12,0,0),
-d(2016,10,30,11,0,0),
-d(2017,4,2,12,0,0),
-d(2017,10,29,11,0,0),
-d(2018,4,1,12,0,0),
-d(2018,10,28,11,0,0),
-d(2019,4,7,12,0,0),
-d(2019,10,27,11,0,0),
-d(2020,4,5,12,0,0),
-d(2020,10,25,11,0,0),
-d(2021,4,4,12,0,0),
-d(2021,10,31,11,0,0),
-d(2022,4,3,12,0,0),
-d(2022,10,30,11,0,0),
-d(2023,4,2,12,0,0),
-d(2023,10,29,11,0,0),
-d(2024,4,7,12,0,0),
-d(2024,10,27,11,0,0),
-d(2025,4,6,12,0,0),
-d(2025,10,26,11,0,0),
-d(2026,4,5,12,0,0),
-d(2026,10,25,11,0,0),
-d(2027,4,4,12,0,0),
-d(2027,10,31,11,0,0),
-d(2028,4,2,12,0,0),
-d(2028,10,29,11,0,0),
-d(2029,4,1,12,0,0),
-d(2029,10,28,11,0,0),
-d(2030,4,7,12,0,0),
-d(2030,10,27,11,0,0),
-d(2031,4,6,12,0,0),
-d(2031,10,26,11,0,0),
-d(2032,4,4,12,0,0),
-d(2032,10,31,11,0,0),
-d(2033,4,3,12,0,0),
-d(2033,10,30,11,0,0),
-d(2034,4,2,12,0,0),
-d(2034,10,29,11,0,0),
-d(2035,4,1,12,0,0),
-d(2035,10,28,11,0,0),
-d(2036,4,6,12,0,0),
-d(2036,10,26,11,0,0),
-d(2037,4,5,12,0,0),
-d(2037,10,25,11,0,0),
+d(2007,3,11,12,0,0),
+d(2007,11,4,11,0,0),
+d(2008,3,9,12,0,0),
+d(2008,11,2,11,0,0),
+d(2009,3,8,12,0,0),
+d(2009,11,1,11,0,0),
+d(2010,3,14,12,0,0),
+d(2010,11,7,11,0,0),
+d(2011,3,13,12,0,0),
+d(2011,11,6,11,0,0),
+d(2012,3,11,12,0,0),
+d(2012,11,4,11,0,0),
+d(2013,3,10,12,0,0),
+d(2013,11,3,11,0,0),
+d(2014,3,9,12,0,0),
+d(2014,11,2,11,0,0),
+d(2015,3,8,12,0,0),
+d(2015,11,1,11,0,0),
+d(2016,3,13,12,0,0),
+d(2016,11,6,11,0,0),
+d(2017,3,12,12,0,0),
+d(2017,11,5,11,0,0),
+d(2018,3,11,12,0,0),
+d(2018,11,4,11,0,0),
+d(2019,3,10,12,0,0),
+d(2019,11,3,11,0,0),
+d(2020,3,8,12,0,0),
+d(2020,11,1,11,0,0),
+d(2021,3,14,12,0,0),
+d(2021,11,7,11,0,0),
+d(2022,3,13,12,0,0),
+d(2022,11,6,11,0,0),
+d(2023,3,12,12,0,0),
+d(2023,11,5,11,0,0),
+d(2024,3,10,12,0,0),
+d(2024,11,3,11,0,0),
+d(2025,3,9,12,0,0),
+d(2025,11,2,11,0,0),
+d(2026,3,8,12,0,0),
+d(2026,11,1,11,0,0),
+d(2027,3,14,12,0,0),
+d(2027,11,7,11,0,0),
+d(2028,3,12,12,0,0),
+d(2028,11,5,11,0,0),
+d(2029,3,11,12,0,0),
+d(2029,11,4,11,0,0),
+d(2030,3,10,12,0,0),
+d(2030,11,3,11,0,0),
+d(2031,3,9,12,0,0),
+d(2031,11,2,11,0,0),
+d(2032,3,14,12,0,0),
+d(2032,11,7,11,0,0),
+d(2033,3,13,12,0,0),
+d(2033,11,6,11,0,0),
+d(2034,3,12,12,0,0),
+d(2034,11,5,11,0,0),
+d(2035,3,11,12,0,0),
+d(2035,11,4,11,0,0),
+d(2036,3,9,12,0,0),
+d(2036,11,2,11,0,0),
+d(2037,3,8,12,0,0),
+d(2037,11,1,11,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Anchorage.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Anchorage.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Anchorage.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,10,0,0),
 d(2006,4,2,11,0,0),
 d(2006,10,29,10,0,0),
-d(2007,4,1,11,0,0),
-d(2007,10,28,10,0,0),
-d(2008,4,6,11,0,0),
-d(2008,10,26,10,0,0),
-d(2009,4,5,11,0,0),
-d(2009,10,25,10,0,0),
-d(2010,4,4,11,0,0),
-d(2010,10,31,10,0,0),
-d(2011,4,3,11,0,0),
-d(2011,10,30,10,0,0),
-d(2012,4,1,11,0,0),
-d(2012,10,28,10,0,0),
-d(2013,4,7,11,0,0),
-d(2013,10,27,10,0,0),
-d(2014,4,6,11,0,0),
-d(2014,10,26,10,0,0),
-d(2015,4,5,11,0,0),
-d(2015,10,25,10,0,0),
-d(2016,4,3,11,0,0),
-d(2016,10,30,10,0,0),
-d(2017,4,2,11,0,0),
-d(2017,10,29,10,0,0),
-d(2018,4,1,11,0,0),
-d(2018,10,28,10,0,0),
-d(2019,4,7,11,0,0),
-d(2019,10,27,10,0,0),
-d(2020,4,5,11,0,0),
-d(2020,10,25,10,0,0),
-d(2021,4,4,11,0,0),
-d(2021,10,31,10,0,0),
-d(2022,4,3,11,0,0),
-d(2022,10,30,10,0,0),
-d(2023,4,2,11,0,0),
-d(2023,10,29,10,0,0),
-d(2024,4,7,11,0,0),
-d(2024,10,27,10,0,0),
-d(2025,4,6,11,0,0),
-d(2025,10,26,10,0,0),
-d(2026,4,5,11,0,0),
-d(2026,10,25,10,0,0),
-d(2027,4,4,11,0,0),
-d(2027,10,31,10,0,0),
-d(2028,4,2,11,0,0),
-d(2028,10,29,10,0,0),
-d(2029,4,1,11,0,0),
-d(2029,10,28,10,0,0),
-d(2030,4,7,11,0,0),
-d(2030,10,27,10,0,0),
-d(2031,4,6,11,0,0),
-d(2031,10,26,10,0,0),
-d(2032,4,4,11,0,0),
-d(2032,10,31,10,0,0),
-d(2033,4,3,11,0,0),
-d(2033,10,30,10,0,0),
-d(2034,4,2,11,0,0),
-d(2034,10,29,10,0,0),
-d(2035,4,1,11,0,0),
-d(2035,10,28,10,0,0),
-d(2036,4,6,11,0,0),
-d(2036,10,26,10,0,0),
-d(2037,4,5,11,0,0),
-d(2037,10,25,10,0,0),
+d(2007,3,11,11,0,0),
+d(2007,11,4,10,0,0),
+d(2008,3,9,11,0,0),
+d(2008,11,2,10,0,0),
+d(2009,3,8,11,0,0),
+d(2009,11,1,10,0,0),
+d(2010,3,14,11,0,0),
+d(2010,11,7,10,0,0),
+d(2011,3,13,11,0,0),
+d(2011,11,6,10,0,0),
+d(2012,3,11,11,0,0),
+d(2012,11,4,10,0,0),
+d(2013,3,10,11,0,0),
+d(2013,11,3,10,0,0),
+d(2014,3,9,11,0,0),
+d(2014,11,2,10,0,0),
+d(2015,3,8,11,0,0),
+d(2015,11,1,10,0,0),
+d(2016,3,13,11,0,0),
+d(2016,11,6,10,0,0),
+d(2017,3,12,11,0,0),
+d(2017,11,5,10,0,0),
+d(2018,3,11,11,0,0),
+d(2018,11,4,10,0,0),
+d(2019,3,10,11,0,0),
+d(2019,11,3,10,0,0),
+d(2020,3,8,11,0,0),
+d(2020,11,1,10,0,0),
+d(2021,3,14,11,0,0),
+d(2021,11,7,10,0,0),
+d(2022,3,13,11,0,0),
+d(2022,11,6,10,0,0),
+d(2023,3,12,11,0,0),
+d(2023,11,5,10,0,0),
+d(2024,3,10,11,0,0),
+d(2024,11,3,10,0,0),
+d(2025,3,9,11,0,0),
+d(2025,11,2,10,0,0),
+d(2026,3,8,11,0,0),
+d(2026,11,1,10,0,0),
+d(2027,3,14,11,0,0),
+d(2027,11,7,10,0,0),
+d(2028,3,12,11,0,0),
+d(2028,11,5,10,0,0),
+d(2029,3,11,11,0,0),
+d(2029,11,4,10,0,0),
+d(2030,3,10,11,0,0),
+d(2030,11,3,10,0,0),
+d(2031,3,9,11,0,0),
+d(2031,11,2,10,0,0),
+d(2032,3,14,11,0,0),
+d(2032,11,7,10,0,0),
+d(2033,3,13,11,0,0),
+d(2033,11,6,10,0,0),
+d(2034,3,12,11,0,0),
+d(2034,11,5,10,0,0),
+d(2035,3,11,11,0,0),
+d(2035,11,4,10,0,0),
+d(2036,3,9,11,0,0),
+d(2036,11,2,10,0,0),
+d(2037,3,8,11,0,0),
+d(2037,11,1,10,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Atka.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Atka.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Atka.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,11,0,0),
 d(2006,4,2,12,0,0),
 d(2006,10,29,11,0,0),
-d(2007,4,1,12,0,0),
-d(2007,10,28,11,0,0),
-d(2008,4,6,12,0,0),
-d(2008,10,26,11,0,0),
-d(2009,4,5,12,0,0),
-d(2009,10,25,11,0,0),
-d(2010,4,4,12,0,0),
-d(2010,10,31,11,0,0),
-d(2011,4,3,12,0,0),
-d(2011,10,30,11,0,0),
-d(2012,4,1,12,0,0),
-d(2012,10,28,11,0,0),
-d(2013,4,7,12,0,0),
-d(2013,10,27,11,0,0),
-d(2014,4,6,12,0,0),
-d(2014,10,26,11,0,0),
-d(2015,4,5,12,0,0),
-d(2015,10,25,11,0,0),
-d(2016,4,3,12,0,0),
-d(2016,10,30,11,0,0),
-d(2017,4,2,12,0,0),
-d(2017,10,29,11,0,0),
-d(2018,4,1,12,0,0),
-d(2018,10,28,11,0,0),
-d(2019,4,7,12,0,0),
-d(2019,10,27,11,0,0),
-d(2020,4,5,12,0,0),
-d(2020,10,25,11,0,0),
-d(2021,4,4,12,0,0),
-d(2021,10,31,11,0,0),
-d(2022,4,3,12,0,0),
-d(2022,10,30,11,0,0),
-d(2023,4,2,12,0,0),
-d(2023,10,29,11,0,0),
-d(2024,4,7,12,0,0),
-d(2024,10,27,11,0,0),
-d(2025,4,6,12,0,0),
-d(2025,10,26,11,0,0),
-d(2026,4,5,12,0,0),
-d(2026,10,25,11,0,0),
-d(2027,4,4,12,0,0),
-d(2027,10,31,11,0,0),
-d(2028,4,2,12,0,0),
-d(2028,10,29,11,0,0),
-d(2029,4,1,12,0,0),
-d(2029,10,28,11,0,0),
-d(2030,4,7,12,0,0),
-d(2030,10,27,11,0,0),
-d(2031,4,6,12,0,0),
-d(2031,10,26,11,0,0),
-d(2032,4,4,12,0,0),
-d(2032,10,31,11,0,0),
-d(2033,4,3,12,0,0),
-d(2033,10,30,11,0,0),
-d(2034,4,2,12,0,0),
-d(2034,10,29,11,0,0),
-d(2035,4,1,12,0,0),
-d(2035,10,28,11,0,0),
-d(2036,4,6,12,0,0),
-d(2036,10,26,11,0,0),
-d(2037,4,5,12,0,0),
-d(2037,10,25,11,0,0),
+d(2007,3,11,12,0,0),
+d(2007,11,4,11,0,0),
+d(2008,3,9,12,0,0),
+d(2008,11,2,11,0,0),
+d(2009,3,8,12,0,0),
+d(2009,11,1,11,0,0),
+d(2010,3,14,12,0,0),
+d(2010,11,7,11,0,0),
+d(2011,3,13,12,0,0),
+d(2011,11,6,11,0,0),
+d(2012,3,11,12,0,0),
+d(2012,11,4,11,0,0),
+d(2013,3,10,12,0,0),
+d(2013,11,3,11,0,0),
+d(2014,3,9,12,0,0),
+d(2014,11,2,11,0,0),
+d(2015,3,8,12,0,0),
+d(2015,11,1,11,0,0),
+d(2016,3,13,12,0,0),
+d(2016,11,6,11,0,0),
+d(2017,3,12,12,0,0),
+d(2017,11,5,11,0,0),
+d(2018,3,11,12,0,0),
+d(2018,11,4,11,0,0),
+d(2019,3,10,12,0,0),
+d(2019,11,3,11,0,0),
+d(2020,3,8,12,0,0),
+d(2020,11,1,11,0,0),
+d(2021,3,14,12,0,0),
+d(2021,11,7,11,0,0),
+d(2022,3,13,12,0,0),
+d(2022,11,6,11,0,0),
+d(2023,3,12,12,0,0),
+d(2023,11,5,11,0,0),
+d(2024,3,10,12,0,0),
+d(2024,11,3,11,0,0),
+d(2025,3,9,12,0,0),
+d(2025,11,2,11,0,0),
+d(2026,3,8,12,0,0),
+d(2026,11,1,11,0,0),
+d(2027,3,14,12,0,0),
+d(2027,11,7,11,0,0),
+d(2028,3,12,12,0,0),
+d(2028,11,5,11,0,0),
+d(2029,3,11,12,0,0),
+d(2029,11,4,11,0,0),
+d(2030,3,10,12,0,0),
+d(2030,11,3,11,0,0),
+d(2031,3,9,12,0,0),
+d(2031,11,2,11,0,0),
+d(2032,3,14,12,0,0),
+d(2032,11,7,11,0,0),
+d(2033,3,13,12,0,0),
+d(2033,11,6,11,0,0),
+d(2034,3,12,12,0,0),
+d(2034,11,5,11,0,0),
+d(2035,3,11,12,0,0),
+d(2035,11,4,11,0,0),
+d(2036,3,9,12,0,0),
+d(2036,11,2,11,0,0),
+d(2037,3,8,12,0,0),
+d(2037,11,1,11,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Boise.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Boise.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Boise.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -98,68 +98,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Chicago.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Chicago.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Chicago.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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 = [

Copied: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Coral_Harbour.py (from rev 38302, Zope3/trunk/src/pytz/zoneinfo/America/Coral_Harbour.py)


Property changes on: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Coral_Harbour.py
___________________________________________________________________
Name: svn:keywords "LastChangedDate Author Id LastChangedRevision LastChangedBy HeadURL"
   + 
Name: svn:eol-style
   + native

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Denver.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Denver.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Denver.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -105,68 +105,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Detroit.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Detroit.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Detroit.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,68 +87,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Fort_Wayne.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Fort_Wayne.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Fort_Wayne.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -44,6 +44,70 @@
 d(1969,10,26,6,0,0),
 d(1970,4,26,7,0,0),
 d(1970,10,25,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -82,6 +146,70 @@
 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,'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'),
         ]
 
 Fort_Wayne = Fort_Wayne()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Indianapolis.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Indianapolis.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Indianapolis.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -44,6 +44,70 @@
 d(1969,10,26,6,0,0),
 d(1970,4,26,7,0,0),
 d(1970,10,25,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -82,6 +146,70 @@
 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,'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'),
         ]
 
 Indianapolis = Indianapolis()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Knox.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Knox.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Knox.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -99,6 +99,70 @@
 d(1990,10,28,7,0,0),
 d(1991,4,7,8,0,0),
 d(1991,10,27,7,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -192,6 +256,70 @@
 i(-21600,0,'CST'),
 i(-18000,3600,'CDT'),
 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,'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'),
         ]
 
 Knox = Knox()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Marengo.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Marengo.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Marengo.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -48,6 +48,70 @@
 d(1974,10,27,7,0,0),
 d(1975,2,23,7,0,0),
 d(1975,10,26,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -90,6 +154,70 @@
 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,'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'),
         ]
 
 Marengo = Marengo()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Vevay.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Vevay.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indiana/Vevay.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -26,6 +26,70 @@
 d(1971,10,31,6,0,0),
 d(1972,4,30,7,0,0),
 d(1972,10,29,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -46,6 +110,70 @@
 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,'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'),
         ]
 
 Vevay = Vevay()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indianapolis.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indianapolis.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Indianapolis.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -44,6 +44,70 @@
 d(1969,10,26,6,0,0),
 d(1970,4,26,7,0,0),
 d(1970,10,25,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -82,6 +146,70 @@
 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,'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'),
         ]
 
 Indianapolis = Indianapolis()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Juneau.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Juneau.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Juneau.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -90,68 +90,68 @@
 d(2005,10,30,10,0,0),
 d(2006,4,2,11,0,0),
 d(2006,10,29,10,0,0),
-d(2007,4,1,11,0,0),
-d(2007,10,28,10,0,0),
-d(2008,4,6,11,0,0),
-d(2008,10,26,10,0,0),
-d(2009,4,5,11,0,0),
-d(2009,10,25,10,0,0),
-d(2010,4,4,11,0,0),
-d(2010,10,31,10,0,0),
-d(2011,4,3,11,0,0),
-d(2011,10,30,10,0,0),
-d(2012,4,1,11,0,0),
-d(2012,10,28,10,0,0),
-d(2013,4,7,11,0,0),
-d(2013,10,27,10,0,0),
-d(2014,4,6,11,0,0),
-d(2014,10,26,10,0,0),
-d(2015,4,5,11,0,0),
-d(2015,10,25,10,0,0),
-d(2016,4,3,11,0,0),
-d(2016,10,30,10,0,0),
-d(2017,4,2,11,0,0),
-d(2017,10,29,10,0,0),
-d(2018,4,1,11,0,0),
-d(2018,10,28,10,0,0),
-d(2019,4,7,11,0,0),
-d(2019,10,27,10,0,0),
-d(2020,4,5,11,0,0),
-d(2020,10,25,10,0,0),
-d(2021,4,4,11,0,0),
-d(2021,10,31,10,0,0),
-d(2022,4,3,11,0,0),
-d(2022,10,30,10,0,0),
-d(2023,4,2,11,0,0),
-d(2023,10,29,10,0,0),
-d(2024,4,7,11,0,0),
-d(2024,10,27,10,0,0),
-d(2025,4,6,11,0,0),
-d(2025,10,26,10,0,0),
-d(2026,4,5,11,0,0),
-d(2026,10,25,10,0,0),
-d(2027,4,4,11,0,0),
-d(2027,10,31,10,0,0),
-d(2028,4,2,11,0,0),
-d(2028,10,29,10,0,0),
-d(2029,4,1,11,0,0),
-d(2029,10,28,10,0,0),
-d(2030,4,7,11,0,0),
-d(2030,10,27,10,0,0),
-d(2031,4,6,11,0,0),
-d(2031,10,26,10,0,0),
-d(2032,4,4,11,0,0),
-d(2032,10,31,10,0,0),
-d(2033,4,3,11,0,0),
-d(2033,10,30,10,0,0),
-d(2034,4,2,11,0,0),
-d(2034,10,29,10,0,0),
-d(2035,4,1,11,0,0),
-d(2035,10,28,10,0,0),
-d(2036,4,6,11,0,0),
-d(2036,10,26,10,0,0),
-d(2037,4,5,11,0,0),
-d(2037,10,25,10,0,0),
+d(2007,3,11,11,0,0),
+d(2007,11,4,10,0,0),
+d(2008,3,9,11,0,0),
+d(2008,11,2,10,0,0),
+d(2009,3,8,11,0,0),
+d(2009,11,1,10,0,0),
+d(2010,3,14,11,0,0),
+d(2010,11,7,10,0,0),
+d(2011,3,13,11,0,0),
+d(2011,11,6,10,0,0),
+d(2012,3,11,11,0,0),
+d(2012,11,4,10,0,0),
+d(2013,3,10,11,0,0),
+d(2013,11,3,10,0,0),
+d(2014,3,9,11,0,0),
+d(2014,11,2,10,0,0),
+d(2015,3,8,11,0,0),
+d(2015,11,1,10,0,0),
+d(2016,3,13,11,0,0),
+d(2016,11,6,10,0,0),
+d(2017,3,12,11,0,0),
+d(2017,11,5,10,0,0),
+d(2018,3,11,11,0,0),
+d(2018,11,4,10,0,0),
+d(2019,3,10,11,0,0),
+d(2019,11,3,10,0,0),
+d(2020,3,8,11,0,0),
+d(2020,11,1,10,0,0),
+d(2021,3,14,11,0,0),
+d(2021,11,7,10,0,0),
+d(2022,3,13,11,0,0),
+d(2022,11,6,10,0,0),
+d(2023,3,12,11,0,0),
+d(2023,11,5,10,0,0),
+d(2024,3,10,11,0,0),
+d(2024,11,3,10,0,0),
+d(2025,3,9,11,0,0),
+d(2025,11,2,10,0,0),
+d(2026,3,8,11,0,0),
+d(2026,11,1,10,0,0),
+d(2027,3,14,11,0,0),
+d(2027,11,7,10,0,0),
+d(2028,3,12,11,0,0),
+d(2028,11,5,10,0,0),
+d(2029,3,11,11,0,0),
+d(2029,11,4,10,0,0),
+d(2030,3,10,11,0,0),
+d(2030,11,3,10,0,0),
+d(2031,3,9,11,0,0),
+d(2031,11,2,10,0,0),
+d(2032,3,14,11,0,0),
+d(2032,11,7,10,0,0),
+d(2033,3,13,11,0,0),
+d(2033,11,6,10,0,0),
+d(2034,3,12,11,0,0),
+d(2034,11,5,10,0,0),
+d(2035,3,11,11,0,0),
+d(2035,11,4,10,0,0),
+d(2036,3,9,11,0,0),
+d(2036,11,2,10,0,0),
+d(2037,3,8,11,0,0),
+d(2037,11,1,10,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Louisville.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Louisville.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Louisville.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -125,68 +125,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Monticello.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Monticello.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Kentucky/Monticello.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -95,68 +95,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Knox_IN.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Knox_IN.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Knox_IN.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -99,6 +99,70 @@
 d(1990,10,28,7,0,0),
 d(1991,4,7,8,0,0),
 d(1991,10,27,7,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -192,6 +256,70 @@
 i(-21600,0,'CST'),
 i(-18000,3600,'CDT'),
 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,'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'),
         ]
 
 Knox_IN = Knox_IN()

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

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Louisville.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Louisville.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Louisville.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -125,68 +125,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Managua.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Managua.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Managua.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -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,11,5,0,0),
+d(2005,9,18,5,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Menominee.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Menominee.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Menominee.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -90,68 +90,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/branches/Zope-3.1/src/pytz/zoneinfo/America/New_York.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/New_York.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/New_York.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Nome.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Nome.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Nome.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,10,0,0),
 d(2006,4,2,11,0,0),
 d(2006,10,29,10,0,0),
-d(2007,4,1,11,0,0),
-d(2007,10,28,10,0,0),
-d(2008,4,6,11,0,0),
-d(2008,10,26,10,0,0),
-d(2009,4,5,11,0,0),
-d(2009,10,25,10,0,0),
-d(2010,4,4,11,0,0),
-d(2010,10,31,10,0,0),
-d(2011,4,3,11,0,0),
-d(2011,10,30,10,0,0),
-d(2012,4,1,11,0,0),
-d(2012,10,28,10,0,0),
-d(2013,4,7,11,0,0),
-d(2013,10,27,10,0,0),
-d(2014,4,6,11,0,0),
-d(2014,10,26,10,0,0),
-d(2015,4,5,11,0,0),
-d(2015,10,25,10,0,0),
-d(2016,4,3,11,0,0),
-d(2016,10,30,10,0,0),
-d(2017,4,2,11,0,0),
-d(2017,10,29,10,0,0),
-d(2018,4,1,11,0,0),
-d(2018,10,28,10,0,0),
-d(2019,4,7,11,0,0),
-d(2019,10,27,10,0,0),
-d(2020,4,5,11,0,0),
-d(2020,10,25,10,0,0),
-d(2021,4,4,11,0,0),
-d(2021,10,31,10,0,0),
-d(2022,4,3,11,0,0),
-d(2022,10,30,10,0,0),
-d(2023,4,2,11,0,0),
-d(2023,10,29,10,0,0),
-d(2024,4,7,11,0,0),
-d(2024,10,27,10,0,0),
-d(2025,4,6,11,0,0),
-d(2025,10,26,10,0,0),
-d(2026,4,5,11,0,0),
-d(2026,10,25,10,0,0),
-d(2027,4,4,11,0,0),
-d(2027,10,31,10,0,0),
-d(2028,4,2,11,0,0),
-d(2028,10,29,10,0,0),
-d(2029,4,1,11,0,0),
-d(2029,10,28,10,0,0),
-d(2030,4,7,11,0,0),
-d(2030,10,27,10,0,0),
-d(2031,4,6,11,0,0),
-d(2031,10,26,10,0,0),
-d(2032,4,4,11,0,0),
-d(2032,10,31,10,0,0),
-d(2033,4,3,11,0,0),
-d(2033,10,30,10,0,0),
-d(2034,4,2,11,0,0),
-d(2034,10,29,10,0,0),
-d(2035,4,1,11,0,0),
-d(2035,10,28,10,0,0),
-d(2036,4,6,11,0,0),
-d(2036,10,26,10,0,0),
-d(2037,4,5,11,0,0),
-d(2037,10,25,10,0,0),
+d(2007,3,11,11,0,0),
+d(2007,11,4,10,0,0),
+d(2008,3,9,11,0,0),
+d(2008,11,2,10,0,0),
+d(2009,3,8,11,0,0),
+d(2009,11,1,10,0,0),
+d(2010,3,14,11,0,0),
+d(2010,11,7,10,0,0),
+d(2011,3,13,11,0,0),
+d(2011,11,6,10,0,0),
+d(2012,3,11,11,0,0),
+d(2012,11,4,10,0,0),
+d(2013,3,10,11,0,0),
+d(2013,11,3,10,0,0),
+d(2014,3,9,11,0,0),
+d(2014,11,2,10,0,0),
+d(2015,3,8,11,0,0),
+d(2015,11,1,10,0,0),
+d(2016,3,13,11,0,0),
+d(2016,11,6,10,0,0),
+d(2017,3,12,11,0,0),
+d(2017,11,5,10,0,0),
+d(2018,3,11,11,0,0),
+d(2018,11,4,10,0,0),
+d(2019,3,10,11,0,0),
+d(2019,11,3,10,0,0),
+d(2020,3,8,11,0,0),
+d(2020,11,1,10,0,0),
+d(2021,3,14,11,0,0),
+d(2021,11,7,10,0,0),
+d(2022,3,13,11,0,0),
+d(2022,11,6,10,0,0),
+d(2023,3,12,11,0,0),
+d(2023,11,5,10,0,0),
+d(2024,3,10,11,0,0),
+d(2024,11,3,10,0,0),
+d(2025,3,9,11,0,0),
+d(2025,11,2,10,0,0),
+d(2026,3,8,11,0,0),
+d(2026,11,1,10,0,0),
+d(2027,3,14,11,0,0),
+d(2027,11,7,10,0,0),
+d(2028,3,12,11,0,0),
+d(2028,11,5,10,0,0),
+d(2029,3,11,11,0,0),
+d(2029,11,4,10,0,0),
+d(2030,3,10,11,0,0),
+d(2030,11,3,10,0,0),
+d(2031,3,9,11,0,0),
+d(2031,11,2,10,0,0),
+d(2032,3,14,11,0,0),
+d(2032,11,7,10,0,0),
+d(2033,3,13,11,0,0),
+d(2033,11,6,10,0,0),
+d(2034,3,12,11,0,0),
+d(2034,11,5,10,0,0),
+d(2035,3,11,11,0,0),
+d(2035,11,4,10,0,0),
+d(2036,3,9,11,0,0),
+d(2036,11,2,10,0,0),
+d(2037,3,8,11,0,0),
+d(2037,11,1,10,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/North_Dakota/Center.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/North_Dakota/Center.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/North_Dakota/Center.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -97,68 +97,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Shiprock.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Shiprock.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Shiprock.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -105,68 +105,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/branches/Zope-3.1/src/pytz/zoneinfo/America/Yakutat.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Yakutat.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/America/Yakutat.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -90,68 +90,68 @@
 d(2005,10,30,10,0,0),
 d(2006,4,2,11,0,0),
 d(2006,10,29,10,0,0),
-d(2007,4,1,11,0,0),
-d(2007,10,28,10,0,0),
-d(2008,4,6,11,0,0),
-d(2008,10,26,10,0,0),
-d(2009,4,5,11,0,0),
-d(2009,10,25,10,0,0),
-d(2010,4,4,11,0,0),
-d(2010,10,31,10,0,0),
-d(2011,4,3,11,0,0),
-d(2011,10,30,10,0,0),
-d(2012,4,1,11,0,0),
-d(2012,10,28,10,0,0),
-d(2013,4,7,11,0,0),
-d(2013,10,27,10,0,0),
-d(2014,4,6,11,0,0),
-d(2014,10,26,10,0,0),
-d(2015,4,5,11,0,0),
-d(2015,10,25,10,0,0),
-d(2016,4,3,11,0,0),
-d(2016,10,30,10,0,0),
-d(2017,4,2,11,0,0),
-d(2017,10,29,10,0,0),
-d(2018,4,1,11,0,0),
-d(2018,10,28,10,0,0),
-d(2019,4,7,11,0,0),
-d(2019,10,27,10,0,0),
-d(2020,4,5,11,0,0),
-d(2020,10,25,10,0,0),
-d(2021,4,4,11,0,0),
-d(2021,10,31,10,0,0),
-d(2022,4,3,11,0,0),
-d(2022,10,30,10,0,0),
-d(2023,4,2,11,0,0),
-d(2023,10,29,10,0,0),
-d(2024,4,7,11,0,0),
-d(2024,10,27,10,0,0),
-d(2025,4,6,11,0,0),
-d(2025,10,26,10,0,0),
-d(2026,4,5,11,0,0),
-d(2026,10,25,10,0,0),
-d(2027,4,4,11,0,0),
-d(2027,10,31,10,0,0),
-d(2028,4,2,11,0,0),
-d(2028,10,29,10,0,0),
-d(2029,4,1,11,0,0),
-d(2029,10,28,10,0,0),
-d(2030,4,7,11,0,0),
-d(2030,10,27,10,0,0),
-d(2031,4,6,11,0,0),
-d(2031,10,26,10,0,0),
-d(2032,4,4,11,0,0),
-d(2032,10,31,10,0,0),
-d(2033,4,3,11,0,0),
-d(2033,10,30,10,0,0),
-d(2034,4,2,11,0,0),
-d(2034,10,29,10,0,0),
-d(2035,4,1,11,0,0),
-d(2035,10,28,10,0,0),
-d(2036,4,6,11,0,0),
-d(2036,10,26,10,0,0),
-d(2037,4,5,11,0,0),
-d(2037,10,25,10,0,0),
+d(2007,3,11,11,0,0),
+d(2007,11,4,10,0,0),
+d(2008,3,9,11,0,0),
+d(2008,11,2,10,0,0),
+d(2009,3,8,11,0,0),
+d(2009,11,1,10,0,0),
+d(2010,3,14,11,0,0),
+d(2010,11,7,10,0,0),
+d(2011,3,13,11,0,0),
+d(2011,11,6,10,0,0),
+d(2012,3,11,11,0,0),
+d(2012,11,4,10,0,0),
+d(2013,3,10,11,0,0),
+d(2013,11,3,10,0,0),
+d(2014,3,9,11,0,0),
+d(2014,11,2,10,0,0),
+d(2015,3,8,11,0,0),
+d(2015,11,1,10,0,0),
+d(2016,3,13,11,0,0),
+d(2016,11,6,10,0,0),
+d(2017,3,12,11,0,0),
+d(2017,11,5,10,0,0),
+d(2018,3,11,11,0,0),
+d(2018,11,4,10,0,0),
+d(2019,3,10,11,0,0),
+d(2019,11,3,10,0,0),
+d(2020,3,8,11,0,0),
+d(2020,11,1,10,0,0),
+d(2021,3,14,11,0,0),
+d(2021,11,7,10,0,0),
+d(2022,3,13,11,0,0),
+d(2022,11,6,10,0,0),
+d(2023,3,12,11,0,0),
+d(2023,11,5,10,0,0),
+d(2024,3,10,11,0,0),
+d(2024,11,3,10,0,0),
+d(2025,3,9,11,0,0),
+d(2025,11,2,10,0,0),
+d(2026,3,8,11,0,0),
+d(2026,11,1,10,0,0),
+d(2027,3,14,11,0,0),
+d(2027,11,7,10,0,0),
+d(2028,3,12,11,0,0),
+d(2028,11,5,10,0,0),
+d(2029,3,11,11,0,0),
+d(2029,11,4,10,0,0),
+d(2030,3,10,11,0,0),
+d(2030,11,3,10,0,0),
+d(2031,3,9,11,0,0),
+d(2031,11,2,10,0,0),
+d(2032,3,14,11,0,0),
+d(2032,11,7,10,0,0),
+d(2033,3,13,11,0,0),
+d(2033,11,6,10,0,0),
+d(2034,3,12,11,0,0),
+d(2034,11,5,10,0,0),
+d(2035,3,11,11,0,0),
+d(2035,11,4,10,0,0),
+d(2036,3,9,11,0,0),
+d(2036,11,2,10,0,0),
+d(2037,3,8,11,0,0),
+d(2037,11,1,10,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Aqtau.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Aqtau.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Aqtau.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -115,7 +115,7 @@
 i(14400,0,'AQTT'),
 i(18000,3600,'AQTST'),
 i(14400,0,'AQTT'),
-i(14400,0,'AQTT'),
+i(18000,0,'AQTT'),
         ]
 
 Aqtau = Aqtau()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Dili.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Dili.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Dili.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -19,11 +19,11 @@
 
     _transition_info = [
 i(30120,0,'LMT'),
-i(28800,0,'TPT'),
+i(28800,0,'TLT'),
 i(32400,0,'JST'),
-i(32400,0,'TPT'),
+i(32400,0,'TLT'),
 i(28800,0,'CIT'),
-i(32400,0,'TPT'),
+i(32400,0,'TLT'),
         ]
 
 Dili = Dili()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Oral.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Oral.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Oral.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -115,7 +115,7 @@
 i(14400,0,'ORAT'),
 i(18000,3600,'ORAST'),
 i(14400,0,'ORAT'),
-i(14400,0,'ORAT'),
+i(18000,0,'ORAT'),
         ]
 
 Oral = Oral()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Tokyo.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Tokyo.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Asia/Tokyo.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -11,11 +11,27 @@
     _utc_transition_times = [
 d(1,1,1,0,0,0),
 d(1937,12,31,15,0,0),
+d(1948,5,1,17,0,0),
+d(1948,9,10,16,0,0),
+d(1949,4,2,17,0,0),
+d(1949,9,9,16,0,0),
+d(1950,5,6,17,0,0),
+d(1950,9,8,16,0,0),
+d(1951,5,5,17,0,0),
+d(1951,9,7,16,0,0),
         ]
 
     _transition_info = [
 i(32400,0,'CJT'),
 i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
         ]
 
 Tokyo = Tokyo()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/ACT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/ACT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/ACT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,29,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,10,28,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,27,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Adelaide.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Adelaide.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Adelaide.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,30,0),
 d(2005,3,26,16,30,0),
 d(2005,10,29,16,30,0),
-d(2006,3,25,16,30,0),
+d(2006,4,1,16,30,0),
 d(2006,10,28,16,30,0),
 d(2007,3,24,16,30,0),
 d(2007,10,27,16,30,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Broken_Hill.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Broken_Hill.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Broken_Hill.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -88,7 +88,7 @@
 d(2004,10,30,16,30,0),
 d(2005,3,26,16,30,0),
 d(2005,10,29,16,30,0),
-d(2006,3,25,16,30,0),
+d(2006,4,1,16,30,0),
 d(2006,10,28,16,30,0),
 d(2007,3,24,16,30,0),
 d(2007,10,27,16,30,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Canberra.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Canberra.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Canberra.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,29,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,10,28,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,27,16,0,0),

Copied: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Currie.py (from rev 38302, Zope3/trunk/src/pytz/zoneinfo/Australia/Currie.py)


Property changes on: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Currie.py
___________________________________________________________________
Name: svn:keywords "LastChangedDate Author Id LastChangedRevision LastChangedBy HeadURL"
   + 
Name: svn:eol-style
   + native

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Hobart.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Hobart.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Hobart.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -95,7 +95,7 @@
 d(2004,10,2,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,1,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,9,30,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,6,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/LHI.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/LHI.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/LHI.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -60,7 +60,7 @@
 d(2004,10,30,15,30,0),
 d(2005,3,26,15,0,0),
 d(2005,10,29,15,30,0),
-d(2006,3,25,15,0,0),
+d(2006,4,1,15,0,0),
 d(2006,10,28,15,30,0),
 d(2007,3,24,15,0,0),
 d(2007,10,27,15,30,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Lord_Howe.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Lord_Howe.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Lord_Howe.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -60,7 +60,7 @@
 d(2004,10,30,15,30,0),
 d(2005,3,26,15,0,0),
 d(2005,10,29,15,30,0),
-d(2006,3,25,15,0,0),
+d(2006,4,1,15,0,0),
 d(2006,10,28,15,30,0),
 d(2007,3,24,15,0,0),
 d(2007,10,27,15,30,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Melbourne.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Melbourne.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Melbourne.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,29,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,10,28,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,27,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/NSW.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/NSW.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/NSW.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,29,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,10,28,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,27,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/South.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/South.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/South.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,30,0),
 d(2005,3,26,16,30,0),
 d(2005,10,29,16,30,0),
-d(2006,3,25,16,30,0),
+d(2006,4,1,16,30,0),
 d(2006,10,28,16,30,0),
 d(2007,3,24,16,30,0),
 d(2007,10,27,16,30,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Sydney.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Sydney.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Sydney.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,29,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,10,28,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,27,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Tasmania.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Tasmania.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Tasmania.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -95,7 +95,7 @@
 d(2004,10,2,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,1,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,9,30,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,6,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Victoria.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Victoria.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Victoria.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,7 +87,7 @@
 d(2004,10,30,16,0,0),
 d(2005,3,26,16,0,0),
 d(2005,10,29,16,0,0),
-d(2006,3,25,16,0,0),
+d(2006,4,1,16,0,0),
 d(2006,10,28,16,0,0),
 d(2007,3,24,16,0,0),
 d(2007,10,27,16,0,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Yancowinna.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Yancowinna.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Australia/Yancowinna.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -88,7 +88,7 @@
 d(2004,10,30,16,30,0),
 d(2005,3,26,16,30,0),
 d(2005,10,29,16,30,0),
-d(2006,3,25,16,30,0),
+d(2006,4,1,16,30,0),
 d(2006,10,28,16,30,0),
 d(2007,3,24,16,30,0),
 d(2007,10,27,16,30,0),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/CST6CDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/CST6CDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/CST6CDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/EST.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -10,78 +10,12 @@
 
     _utc_transition_times = [
 d(1,1,1,0,0,0),
-d(1918,3,31,8,0,0),
-d(1918,10,27,7,0,0),
-d(1919,3,30,8,0,0),
-d(1919,10,26,7,0,0),
-d(1941,6,22,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(1957,9,29,7,0,0),
-d(1958,4,27,8,0,0),
-d(1969,4,27,7,0,0),
-d(1969,10,26,6,0,0),
-d(1970,4,26,7,0,0),
-d(1970,10,25,6,0,0),
+d(1908,4,22,5,19,36),
         ]
 
     _transition_info = [
-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'),
-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(-19200,0,'CMT'),
 i(-18000,0,'EST'),
-i(-21600,0,'CST'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
         ]
 
 EST = EST()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST5EDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST5EDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/EST5EDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Belfast.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Belfast.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Belfast.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -10,8 +10,8 @@
 
     _utc_transition_times = [
 d(1,1,1,0,0,0),
-d(1916,5,21,2,25,21),
-d(1916,10,1,2,25,21),
+d(1916,5,21,2,0,0),
+d(1916,10,1,2,0,0),
 d(1917,4,8,2,0,0),
 d(1917,9,17,2,0,0),
 d(1918,3,24,2,0,0),
@@ -255,8 +255,6 @@
         ]
 
     _transition_info = [
-i(-1500,0,'DMT'),
-i(2100,3600,'IST'),
 i(0,0,'GMT'),
 i(3600,3600,'BST'),
 i(0,0,'GMT'),
@@ -305,6 +303,8 @@
 i(3600,3600,'BST'),
 i(0,0,'GMT'),
 i(3600,3600,'BST'),
+i(0,0,'GMT'),
+i(3600,3600,'BST'),
 i(7200,7200,'BDST'),
 i(3600,3600,'BST'),
 i(7200,7200,'BDST'),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Warsaw.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Warsaw.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Europe/Warsaw.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -29,11 +29,13 @@
 d(1945,4,28,23,0,0),
 d(1945,10,31,22,0,0),
 d(1946,4,13,23,0,0),
-d(1946,9,6,22,0,0),
-d(1947,5,3,23,0,0),
-d(1947,10,4,22,0,0),
-d(1948,4,17,23,0,0),
-d(1948,10,2,22,0,0),
+d(1946,10,7,1,0,0),
+d(1947,5,4,1,0,0),
+d(1947,10,5,1,0,0),
+d(1948,4,18,1,0,0),
+d(1948,10,3,1,0,0),
+d(1949,4,10,1,0,0),
+d(1949,10,2,1,0,0),
 d(1957,6,2,0,0,0),
 d(1957,9,29,0,0,0),
 d(1958,3,30,0,0,0),
@@ -50,6 +52,7 @@
 d(1963,9,29,0,0,0),
 d(1964,5,31,0,0,0),
 d(1964,9,27,0,0,0),
+d(1976,12,31,23,0,0),
 d(1977,4,3,0,0,0),
 d(1977,9,25,0,0,0),
 d(1978,4,2,0,0,0),
@@ -72,29 +75,29 @@
 d(1986,9,28,0,0,0),
 d(1987,3,29,0,0,0),
 d(1987,9,27,0,0,0),
-d(1988,3,27,0,0,0),
-d(1988,9,25,0,0,0),
-d(1989,3,26,0,0,0),
-d(1989,9,24,0,0,0),
-d(1990,3,25,0,0,0),
-d(1990,9,30,0,0,0),
-d(1991,3,31,0,0,0),
-d(1991,9,29,0,0,0),
-d(1992,3,29,0,0,0),
-d(1992,9,27,0,0,0),
-d(1993,3,28,0,0,0),
-d(1993,9,26,0,0,0),
-d(1994,3,27,0,0,0),
-d(1994,9,25,0,0,0),
-d(1995,3,26,0,0,0),
-d(1995,9,24,0,0,0),
-d(1996,3,31,0,0,0),
-d(1996,10,27,0,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(1998,12,31,23,0,0),
+d(1987,12,31,23,0,0),
+d(1988,3,27,1,0,0),
+d(1988,9,25,1,0,0),
+d(1989,3,26,1,0,0),
+d(1989,9,24,1,0,0),
+d(1990,3,25,1,0,0),
+d(1990,9,30,1,0,0),
+d(1991,3,31,1,0,0),
+d(1991,9,29,1,0,0),
+d(1992,3,29,1,0,0),
+d(1992,9,27,1,0,0),
+d(1993,3,28,1,0,0),
+d(1993,9,26,1,0,0),
+d(1994,3,27,1,0,0),
+d(1994,9,25,1,0,0),
+d(1995,3,26,1,0,0),
+d(1995,9,24,1,0,0),
+d(1996,3,31,1,0,0),
+d(1996,10,27,1,0,0),
+d(1997,3,30,1,0,0),
+d(1997,10,26,1,0,0),
+d(1998,3,29,1,0,0),
+d(1998,10,25,1,0,0),
 d(1999,3,28,1,0,0),
 d(1999,10,31,1,0,0),
 d(2000,3,26,1,0,0),
@@ -219,6 +222,7 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
@@ -241,6 +245,7 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
@@ -261,6 +266,7 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(7200,3600,'CEST'),
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Japan.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Japan.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Japan.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -11,11 +11,27 @@
     _utc_transition_times = [
 d(1,1,1,0,0,0),
 d(1937,12,31,15,0,0),
+d(1948,5,1,17,0,0),
+d(1948,9,10,16,0,0),
+d(1949,4,2,17,0,0),
+d(1949,9,9,16,0,0),
+d(1950,5,6,17,0,0),
+d(1950,9,8,16,0,0),
+d(1951,5,5,17,0,0),
+d(1951,9,7,16,0,0),
         ]
 
     _transition_info = [
 i(32400,0,'CJT'),
 i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
+i(36000,3600,'JDT'),
+i(32400,0,'JST'),
         ]
 
 Japan = Japan()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/MST7MDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/MST7MDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/MST7MDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -105,68 +105,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/branches/Zope-3.1/src/pytz/zoneinfo/Navajo.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Navajo.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Navajo.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -105,68 +105,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/branches/Zope-3.1/src/pytz/zoneinfo/PST8PDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/PST8PDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/PST8PDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -133,68 +133,68 @@
 d(2005,10,30,9,0,0),
 d(2006,4,2,10,0,0),
 d(2006,10,29,9,0,0),
-d(2007,4,1,10,0,0),
-d(2007,10,28,9,0,0),
-d(2008,4,6,10,0,0),
-d(2008,10,26,9,0,0),
-d(2009,4,5,10,0,0),
-d(2009,10,25,9,0,0),
-d(2010,4,4,10,0,0),
-d(2010,10,31,9,0,0),
-d(2011,4,3,10,0,0),
-d(2011,10,30,9,0,0),
-d(2012,4,1,10,0,0),
-d(2012,10,28,9,0,0),
-d(2013,4,7,10,0,0),
-d(2013,10,27,9,0,0),
-d(2014,4,6,10,0,0),
-d(2014,10,26,9,0,0),
-d(2015,4,5,10,0,0),
-d(2015,10,25,9,0,0),
-d(2016,4,3,10,0,0),
-d(2016,10,30,9,0,0),
-d(2017,4,2,10,0,0),
-d(2017,10,29,9,0,0),
-d(2018,4,1,10,0,0),
-d(2018,10,28,9,0,0),
-d(2019,4,7,10,0,0),
-d(2019,10,27,9,0,0),
-d(2020,4,5,10,0,0),
-d(2020,10,25,9,0,0),
-d(2021,4,4,10,0,0),
-d(2021,10,31,9,0,0),
-d(2022,4,3,10,0,0),
-d(2022,10,30,9,0,0),
-d(2023,4,2,10,0,0),
-d(2023,10,29,9,0,0),
-d(2024,4,7,10,0,0),
-d(2024,10,27,9,0,0),
-d(2025,4,6,10,0,0),
-d(2025,10,26,9,0,0),
-d(2026,4,5,10,0,0),
-d(2026,10,25,9,0,0),
-d(2027,4,4,10,0,0),
-d(2027,10,31,9,0,0),
-d(2028,4,2,10,0,0),
-d(2028,10,29,9,0,0),
-d(2029,4,1,10,0,0),
-d(2029,10,28,9,0,0),
-d(2030,4,7,10,0,0),
-d(2030,10,27,9,0,0),
-d(2031,4,6,10,0,0),
-d(2031,10,26,9,0,0),
-d(2032,4,4,10,0,0),
-d(2032,10,31,9,0,0),
-d(2033,4,3,10,0,0),
-d(2033,10,30,9,0,0),
-d(2034,4,2,10,0,0),
-d(2034,10,29,9,0,0),
-d(2035,4,1,10,0,0),
-d(2035,10,28,9,0,0),
-d(2036,4,6,10,0,0),
-d(2036,10,26,9,0,0),
-d(2037,4,5,10,0,0),
-d(2037,10,25,9,0,0),
+d(2007,3,11,10,0,0),
+d(2007,11,4,9,0,0),
+d(2008,3,9,10,0,0),
+d(2008,11,2,9,0,0),
+d(2009,3,8,10,0,0),
+d(2009,11,1,9,0,0),
+d(2010,3,14,10,0,0),
+d(2010,11,7,9,0,0),
+d(2011,3,13,10,0,0),
+d(2011,11,6,9,0,0),
+d(2012,3,11,10,0,0),
+d(2012,11,4,9,0,0),
+d(2013,3,10,10,0,0),
+d(2013,11,3,9,0,0),
+d(2014,3,9,10,0,0),
+d(2014,11,2,9,0,0),
+d(2015,3,8,10,0,0),
+d(2015,11,1,9,0,0),
+d(2016,3,13,10,0,0),
+d(2016,11,6,9,0,0),
+d(2017,3,12,10,0,0),
+d(2017,11,5,9,0,0),
+d(2018,3,11,10,0,0),
+d(2018,11,4,9,0,0),
+d(2019,3,10,10,0,0),
+d(2019,11,3,9,0,0),
+d(2020,3,8,10,0,0),
+d(2020,11,1,9,0,0),
+d(2021,3,14,10,0,0),
+d(2021,11,7,9,0,0),
+d(2022,3,13,10,0,0),
+d(2022,11,6,9,0,0),
+d(2023,3,12,10,0,0),
+d(2023,11,5,9,0,0),
+d(2024,3,10,10,0,0),
+d(2024,11,3,9,0,0),
+d(2025,3,9,10,0,0),
+d(2025,11,2,9,0,0),
+d(2026,3,8,10,0,0),
+d(2026,11,1,9,0,0),
+d(2027,3,14,10,0,0),
+d(2027,11,7,9,0,0),
+d(2028,3,12,10,0,0),
+d(2028,11,5,9,0,0),
+d(2029,3,11,10,0,0),
+d(2029,11,4,9,0,0),
+d(2030,3,10,10,0,0),
+d(2030,11,3,9,0,0),
+d(2031,3,9,10,0,0),
+d(2031,11,2,9,0,0),
+d(2032,3,14,10,0,0),
+d(2032,11,7,9,0,0),
+d(2033,3,13,10,0,0),
+d(2033,11,6,9,0,0),
+d(2034,3,12,10,0,0),
+d(2034,11,5,9,0,0),
+d(2035,3,11,10,0,0),
+d(2035,11,4,9,0,0),
+d(2036,3,9,10,0,0),
+d(2036,11,2,9,0,0),
+d(2037,3,8,10,0,0),
+d(2037,11,1,9,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Pacific/Yap.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Pacific/Yap.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Pacific/Yap.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -1,22 +1,12 @@
 '''tzinfo timezone information for Pacific/Yap.'''
-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 Yap(DstTzInfo):
+class Yap(StaticTzInfo):
     '''Pacific/Yap timezone definition. See datetime.tzinfo for details'''
-
     zone = 'Pacific/Yap'
+    _utcoffset = timedelta(seconds=36000)
+    _tzname = 'TRUT'
 
-    _utc_transition_times = [
-d(1,1,1,0,0,0),
-d(1969,9,30,15,0,0),
-        ]
-
-    _transition_info = [
-i(32400,0,'YAPT'),
-i(36000,0,'YAPT'),
-        ]
-
 Yap = Yap()
 

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Poland.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Poland.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/Poland.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -29,11 +29,13 @@
 d(1945,4,28,23,0,0),
 d(1945,10,31,22,0,0),
 d(1946,4,13,23,0,0),
-d(1946,9,6,22,0,0),
-d(1947,5,3,23,0,0),
-d(1947,10,4,22,0,0),
-d(1948,4,17,23,0,0),
-d(1948,10,2,22,0,0),
+d(1946,10,7,1,0,0),
+d(1947,5,4,1,0,0),
+d(1947,10,5,1,0,0),
+d(1948,4,18,1,0,0),
+d(1948,10,3,1,0,0),
+d(1949,4,10,1,0,0),
+d(1949,10,2,1,0,0),
 d(1957,6,2,0,0,0),
 d(1957,9,29,0,0,0),
 d(1958,3,30,0,0,0),
@@ -50,6 +52,7 @@
 d(1963,9,29,0,0,0),
 d(1964,5,31,0,0,0),
 d(1964,9,27,0,0,0),
+d(1976,12,31,23,0,0),
 d(1977,4,3,0,0,0),
 d(1977,9,25,0,0,0),
 d(1978,4,2,0,0,0),
@@ -72,29 +75,29 @@
 d(1986,9,28,0,0,0),
 d(1987,3,29,0,0,0),
 d(1987,9,27,0,0,0),
-d(1988,3,27,0,0,0),
-d(1988,9,25,0,0,0),
-d(1989,3,26,0,0,0),
-d(1989,9,24,0,0,0),
-d(1990,3,25,0,0,0),
-d(1990,9,30,0,0,0),
-d(1991,3,31,0,0,0),
-d(1991,9,29,0,0,0),
-d(1992,3,29,0,0,0),
-d(1992,9,27,0,0,0),
-d(1993,3,28,0,0,0),
-d(1993,9,26,0,0,0),
-d(1994,3,27,0,0,0),
-d(1994,9,25,0,0,0),
-d(1995,3,26,0,0,0),
-d(1995,9,24,0,0,0),
-d(1996,3,31,0,0,0),
-d(1996,10,27,0,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(1998,12,31,23,0,0),
+d(1987,12,31,23,0,0),
+d(1988,3,27,1,0,0),
+d(1988,9,25,1,0,0),
+d(1989,3,26,1,0,0),
+d(1989,9,24,1,0,0),
+d(1990,3,25,1,0,0),
+d(1990,9,30,1,0,0),
+d(1991,3,31,1,0,0),
+d(1991,9,29,1,0,0),
+d(1992,3,29,1,0,0),
+d(1992,9,27,1,0,0),
+d(1993,3,28,1,0,0),
+d(1993,9,26,1,0,0),
+d(1994,3,27,1,0,0),
+d(1994,9,25,1,0,0),
+d(1995,3,26,1,0,0),
+d(1995,9,24,1,0,0),
+d(1996,3,31,1,0,0),
+d(1996,10,27,1,0,0),
+d(1997,3,30,1,0,0),
+d(1997,10,26,1,0,0),
+d(1998,3,29,1,0,0),
+d(1998,10,25,1,0,0),
 d(1999,3,28,1,0,0),
 d(1999,10,31,1,0,0),
 d(2000,3,26,1,0,0),
@@ -219,6 +222,7 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
@@ -241,6 +245,7 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
@@ -261,6 +266,7 @@
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),
+i(7200,3600,'CEST'),
 i(3600,0,'CET'),
 i(7200,3600,'CEST'),
 i(3600,0,'CET'),

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/CST6CDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/CST6CDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/CST6CDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -44,6 +44,70 @@
 d(1969,10,26,6,0,0),
 d(1970,4,26,7,0,0),
 d(1970,10,25,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -82,6 +146,70 @@
 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,'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'),
         ]
 
 EST5 = EST5()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5EDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5EDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/EST5EDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/MST7MDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/MST7MDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/MST7MDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -105,68 +105,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/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/PST8PDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/PST8PDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/PST8PDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -133,68 +133,68 @@
 d(2005,10,30,9,0,0),
 d(2006,4,2,10,0,0),
 d(2006,10,29,9,0,0),
-d(2007,4,1,10,0,0),
-d(2007,10,28,9,0,0),
-d(2008,4,6,10,0,0),
-d(2008,10,26,9,0,0),
-d(2009,4,5,10,0,0),
-d(2009,10,25,9,0,0),
-d(2010,4,4,10,0,0),
-d(2010,10,31,9,0,0),
-d(2011,4,3,10,0,0),
-d(2011,10,30,9,0,0),
-d(2012,4,1,10,0,0),
-d(2012,10,28,9,0,0),
-d(2013,4,7,10,0,0),
-d(2013,10,27,9,0,0),
-d(2014,4,6,10,0,0),
-d(2014,10,26,9,0,0),
-d(2015,4,5,10,0,0),
-d(2015,10,25,9,0,0),
-d(2016,4,3,10,0,0),
-d(2016,10,30,9,0,0),
-d(2017,4,2,10,0,0),
-d(2017,10,29,9,0,0),
-d(2018,4,1,10,0,0),
-d(2018,10,28,9,0,0),
-d(2019,4,7,10,0,0),
-d(2019,10,27,9,0,0),
-d(2020,4,5,10,0,0),
-d(2020,10,25,9,0,0),
-d(2021,4,4,10,0,0),
-d(2021,10,31,9,0,0),
-d(2022,4,3,10,0,0),
-d(2022,10,30,9,0,0),
-d(2023,4,2,10,0,0),
-d(2023,10,29,9,0,0),
-d(2024,4,7,10,0,0),
-d(2024,10,27,9,0,0),
-d(2025,4,6,10,0,0),
-d(2025,10,26,9,0,0),
-d(2026,4,5,10,0,0),
-d(2026,10,25,9,0,0),
-d(2027,4,4,10,0,0),
-d(2027,10,31,9,0,0),
-d(2028,4,2,10,0,0),
-d(2028,10,29,9,0,0),
-d(2029,4,1,10,0,0),
-d(2029,10,28,9,0,0),
-d(2030,4,7,10,0,0),
-d(2030,10,27,9,0,0),
-d(2031,4,6,10,0,0),
-d(2031,10,26,9,0,0),
-d(2032,4,4,10,0,0),
-d(2032,10,31,9,0,0),
-d(2033,4,3,10,0,0),
-d(2033,10,30,9,0,0),
-d(2034,4,2,10,0,0),
-d(2034,10,29,9,0,0),
-d(2035,4,1,10,0,0),
-d(2035,10,28,9,0,0),
-d(2036,4,6,10,0,0),
-d(2036,10,26,9,0,0),
-d(2037,4,5,10,0,0),
-d(2037,10,25,9,0,0),
+d(2007,3,11,10,0,0),
+d(2007,11,4,9,0,0),
+d(2008,3,9,10,0,0),
+d(2008,11,2,9,0,0),
+d(2009,3,8,10,0,0),
+d(2009,11,1,9,0,0),
+d(2010,3,14,10,0,0),
+d(2010,11,7,9,0,0),
+d(2011,3,13,10,0,0),
+d(2011,11,6,9,0,0),
+d(2012,3,11,10,0,0),
+d(2012,11,4,9,0,0),
+d(2013,3,10,10,0,0),
+d(2013,11,3,9,0,0),
+d(2014,3,9,10,0,0),
+d(2014,11,2,9,0,0),
+d(2015,3,8,10,0,0),
+d(2015,11,1,9,0,0),
+d(2016,3,13,10,0,0),
+d(2016,11,6,9,0,0),
+d(2017,3,12,10,0,0),
+d(2017,11,5,9,0,0),
+d(2018,3,11,10,0,0),
+d(2018,11,4,9,0,0),
+d(2019,3,10,10,0,0),
+d(2019,11,3,9,0,0),
+d(2020,3,8,10,0,0),
+d(2020,11,1,9,0,0),
+d(2021,3,14,10,0,0),
+d(2021,11,7,9,0,0),
+d(2022,3,13,10,0,0),
+d(2022,11,6,9,0,0),
+d(2023,3,12,10,0,0),
+d(2023,11,5,9,0,0),
+d(2024,3,10,10,0,0),
+d(2024,11,3,9,0,0),
+d(2025,3,9,10,0,0),
+d(2025,11,2,9,0,0),
+d(2026,3,8,10,0,0),
+d(2026,11,1,9,0,0),
+d(2027,3,14,10,0,0),
+d(2027,11,7,9,0,0),
+d(2028,3,12,10,0,0),
+d(2028,11,5,9,0,0),
+d(2029,3,11,10,0,0),
+d(2029,11,4,9,0,0),
+d(2030,3,10,10,0,0),
+d(2030,11,3,9,0,0),
+d(2031,3,9,10,0,0),
+d(2031,11,2,9,0,0),
+d(2032,3,14,10,0,0),
+d(2032,11,7,9,0,0),
+d(2033,3,13,10,0,0),
+d(2033,11,6,9,0,0),
+d(2034,3,12,10,0,0),
+d(2034,11,5,9,0,0),
+d(2035,3,11,10,0,0),
+d(2035,11,4,9,0,0),
+d(2036,3,9,10,0,0),
+d(2036,11,2,9,0,0),
+d(2037,3,8,10,0,0),
+d(2037,11,1,9,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/YST9YDT.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/YST9YDT.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/SystemV/YST9YDT.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,10,0,0),
 d(2006,4,2,11,0,0),
 d(2006,10,29,10,0,0),
-d(2007,4,1,11,0,0),
-d(2007,10,28,10,0,0),
-d(2008,4,6,11,0,0),
-d(2008,10,26,10,0,0),
-d(2009,4,5,11,0,0),
-d(2009,10,25,10,0,0),
-d(2010,4,4,11,0,0),
-d(2010,10,31,10,0,0),
-d(2011,4,3,11,0,0),
-d(2011,10,30,10,0,0),
-d(2012,4,1,11,0,0),
-d(2012,10,28,10,0,0),
-d(2013,4,7,11,0,0),
-d(2013,10,27,10,0,0),
-d(2014,4,6,11,0,0),
-d(2014,10,26,10,0,0),
-d(2015,4,5,11,0,0),
-d(2015,10,25,10,0,0),
-d(2016,4,3,11,0,0),
-d(2016,10,30,10,0,0),
-d(2017,4,2,11,0,0),
-d(2017,10,29,10,0,0),
-d(2018,4,1,11,0,0),
-d(2018,10,28,10,0,0),
-d(2019,4,7,11,0,0),
-d(2019,10,27,10,0,0),
-d(2020,4,5,11,0,0),
-d(2020,10,25,10,0,0),
-d(2021,4,4,11,0,0),
-d(2021,10,31,10,0,0),
-d(2022,4,3,11,0,0),
-d(2022,10,30,10,0,0),
-d(2023,4,2,11,0,0),
-d(2023,10,29,10,0,0),
-d(2024,4,7,11,0,0),
-d(2024,10,27,10,0,0),
-d(2025,4,6,11,0,0),
-d(2025,10,26,10,0,0),
-d(2026,4,5,11,0,0),
-d(2026,10,25,10,0,0),
-d(2027,4,4,11,0,0),
-d(2027,10,31,10,0,0),
-d(2028,4,2,11,0,0),
-d(2028,10,29,10,0,0),
-d(2029,4,1,11,0,0),
-d(2029,10,28,10,0,0),
-d(2030,4,7,11,0,0),
-d(2030,10,27,10,0,0),
-d(2031,4,6,11,0,0),
-d(2031,10,26,10,0,0),
-d(2032,4,4,11,0,0),
-d(2032,10,31,10,0,0),
-d(2033,4,3,11,0,0),
-d(2033,10,30,10,0,0),
-d(2034,4,2,11,0,0),
-d(2034,10,29,10,0,0),
-d(2035,4,1,11,0,0),
-d(2035,10,28,10,0,0),
-d(2036,4,6,11,0,0),
-d(2036,10,26,10,0,0),
-d(2037,4,5,11,0,0),
-d(2037,10,25,10,0,0),
+d(2007,3,11,11,0,0),
+d(2007,11,4,10,0,0),
+d(2008,3,9,11,0,0),
+d(2008,11,2,10,0,0),
+d(2009,3,8,11,0,0),
+d(2009,11,1,10,0,0),
+d(2010,3,14,11,0,0),
+d(2010,11,7,10,0,0),
+d(2011,3,13,11,0,0),
+d(2011,11,6,10,0,0),
+d(2012,3,11,11,0,0),
+d(2012,11,4,10,0,0),
+d(2013,3,10,11,0,0),
+d(2013,11,3,10,0,0),
+d(2014,3,9,11,0,0),
+d(2014,11,2,10,0,0),
+d(2015,3,8,11,0,0),
+d(2015,11,1,10,0,0),
+d(2016,3,13,11,0,0),
+d(2016,11,6,10,0,0),
+d(2017,3,12,11,0,0),
+d(2017,11,5,10,0,0),
+d(2018,3,11,11,0,0),
+d(2018,11,4,10,0,0),
+d(2019,3,10,11,0,0),
+d(2019,11,3,10,0,0),
+d(2020,3,8,11,0,0),
+d(2020,11,1,10,0,0),
+d(2021,3,14,11,0,0),
+d(2021,11,7,10,0,0),
+d(2022,3,13,11,0,0),
+d(2022,11,6,10,0,0),
+d(2023,3,12,11,0,0),
+d(2023,11,5,10,0,0),
+d(2024,3,10,11,0,0),
+d(2024,11,3,10,0,0),
+d(2025,3,9,11,0,0),
+d(2025,11,2,10,0,0),
+d(2026,3,8,11,0,0),
+d(2026,11,1,10,0,0),
+d(2027,3,14,11,0,0),
+d(2027,11,7,10,0,0),
+d(2028,3,12,11,0,0),
+d(2028,11,5,10,0,0),
+d(2029,3,11,11,0,0),
+d(2029,11,4,10,0,0),
+d(2030,3,10,11,0,0),
+d(2030,11,3,10,0,0),
+d(2031,3,9,11,0,0),
+d(2031,11,2,10,0,0),
+d(2032,3,14,11,0,0),
+d(2032,11,7,10,0,0),
+d(2033,3,13,11,0,0),
+d(2033,11,6,10,0,0),
+d(2034,3,12,11,0,0),
+d(2034,11,5,10,0,0),
+d(2035,3,11,11,0,0),
+d(2035,11,4,10,0,0),
+d(2036,3,9,11,0,0),
+d(2036,11,2,10,0,0),
+d(2037,3,8,11,0,0),
+d(2037,11,1,10,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Alaska.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Alaska.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Alaska.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,10,0,0),
 d(2006,4,2,11,0,0),
 d(2006,10,29,10,0,0),
-d(2007,4,1,11,0,0),
-d(2007,10,28,10,0,0),
-d(2008,4,6,11,0,0),
-d(2008,10,26,10,0,0),
-d(2009,4,5,11,0,0),
-d(2009,10,25,10,0,0),
-d(2010,4,4,11,0,0),
-d(2010,10,31,10,0,0),
-d(2011,4,3,11,0,0),
-d(2011,10,30,10,0,0),
-d(2012,4,1,11,0,0),
-d(2012,10,28,10,0,0),
-d(2013,4,7,11,0,0),
-d(2013,10,27,10,0,0),
-d(2014,4,6,11,0,0),
-d(2014,10,26,10,0,0),
-d(2015,4,5,11,0,0),
-d(2015,10,25,10,0,0),
-d(2016,4,3,11,0,0),
-d(2016,10,30,10,0,0),
-d(2017,4,2,11,0,0),
-d(2017,10,29,10,0,0),
-d(2018,4,1,11,0,0),
-d(2018,10,28,10,0,0),
-d(2019,4,7,11,0,0),
-d(2019,10,27,10,0,0),
-d(2020,4,5,11,0,0),
-d(2020,10,25,10,0,0),
-d(2021,4,4,11,0,0),
-d(2021,10,31,10,0,0),
-d(2022,4,3,11,0,0),
-d(2022,10,30,10,0,0),
-d(2023,4,2,11,0,0),
-d(2023,10,29,10,0,0),
-d(2024,4,7,11,0,0),
-d(2024,10,27,10,0,0),
-d(2025,4,6,11,0,0),
-d(2025,10,26,10,0,0),
-d(2026,4,5,11,0,0),
-d(2026,10,25,10,0,0),
-d(2027,4,4,11,0,0),
-d(2027,10,31,10,0,0),
-d(2028,4,2,11,0,0),
-d(2028,10,29,10,0,0),
-d(2029,4,1,11,0,0),
-d(2029,10,28,10,0,0),
-d(2030,4,7,11,0,0),
-d(2030,10,27,10,0,0),
-d(2031,4,6,11,0,0),
-d(2031,10,26,10,0,0),
-d(2032,4,4,11,0,0),
-d(2032,10,31,10,0,0),
-d(2033,4,3,11,0,0),
-d(2033,10,30,10,0,0),
-d(2034,4,2,11,0,0),
-d(2034,10,29,10,0,0),
-d(2035,4,1,11,0,0),
-d(2035,10,28,10,0,0),
-d(2036,4,6,11,0,0),
-d(2036,10,26,10,0,0),
-d(2037,4,5,11,0,0),
-d(2037,10,25,10,0,0),
+d(2007,3,11,11,0,0),
+d(2007,11,4,10,0,0),
+d(2008,3,9,11,0,0),
+d(2008,11,2,10,0,0),
+d(2009,3,8,11,0,0),
+d(2009,11,1,10,0,0),
+d(2010,3,14,11,0,0),
+d(2010,11,7,10,0,0),
+d(2011,3,13,11,0,0),
+d(2011,11,6,10,0,0),
+d(2012,3,11,11,0,0),
+d(2012,11,4,10,0,0),
+d(2013,3,10,11,0,0),
+d(2013,11,3,10,0,0),
+d(2014,3,9,11,0,0),
+d(2014,11,2,10,0,0),
+d(2015,3,8,11,0,0),
+d(2015,11,1,10,0,0),
+d(2016,3,13,11,0,0),
+d(2016,11,6,10,0,0),
+d(2017,3,12,11,0,0),
+d(2017,11,5,10,0,0),
+d(2018,3,11,11,0,0),
+d(2018,11,4,10,0,0),
+d(2019,3,10,11,0,0),
+d(2019,11,3,10,0,0),
+d(2020,3,8,11,0,0),
+d(2020,11,1,10,0,0),
+d(2021,3,14,11,0,0),
+d(2021,11,7,10,0,0),
+d(2022,3,13,11,0,0),
+d(2022,11,6,10,0,0),
+d(2023,3,12,11,0,0),
+d(2023,11,5,10,0,0),
+d(2024,3,10,11,0,0),
+d(2024,11,3,10,0,0),
+d(2025,3,9,11,0,0),
+d(2025,11,2,10,0,0),
+d(2026,3,8,11,0,0),
+d(2026,11,1,10,0,0),
+d(2027,3,14,11,0,0),
+d(2027,11,7,10,0,0),
+d(2028,3,12,11,0,0),
+d(2028,11,5,10,0,0),
+d(2029,3,11,11,0,0),
+d(2029,11,4,10,0,0),
+d(2030,3,10,11,0,0),
+d(2030,11,3,10,0,0),
+d(2031,3,9,11,0,0),
+d(2031,11,2,10,0,0),
+d(2032,3,14,11,0,0),
+d(2032,11,7,10,0,0),
+d(2033,3,13,11,0,0),
+d(2033,11,6,10,0,0),
+d(2034,3,12,11,0,0),
+d(2034,11,5,10,0,0),
+d(2035,3,11,11,0,0),
+d(2035,11,4,10,0,0),
+d(2036,3,9,11,0,0),
+d(2036,11,2,10,0,0),
+d(2037,3,8,11,0,0),
+d(2037,11,1,10,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Aleutian.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Aleutian.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Aleutian.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -91,68 +91,68 @@
 d(2005,10,30,11,0,0),
 d(2006,4,2,12,0,0),
 d(2006,10,29,11,0,0),
-d(2007,4,1,12,0,0),
-d(2007,10,28,11,0,0),
-d(2008,4,6,12,0,0),
-d(2008,10,26,11,0,0),
-d(2009,4,5,12,0,0),
-d(2009,10,25,11,0,0),
-d(2010,4,4,12,0,0),
-d(2010,10,31,11,0,0),
-d(2011,4,3,12,0,0),
-d(2011,10,30,11,0,0),
-d(2012,4,1,12,0,0),
-d(2012,10,28,11,0,0),
-d(2013,4,7,12,0,0),
-d(2013,10,27,11,0,0),
-d(2014,4,6,12,0,0),
-d(2014,10,26,11,0,0),
-d(2015,4,5,12,0,0),
-d(2015,10,25,11,0,0),
-d(2016,4,3,12,0,0),
-d(2016,10,30,11,0,0),
-d(2017,4,2,12,0,0),
-d(2017,10,29,11,0,0),
-d(2018,4,1,12,0,0),
-d(2018,10,28,11,0,0),
-d(2019,4,7,12,0,0),
-d(2019,10,27,11,0,0),
-d(2020,4,5,12,0,0),
-d(2020,10,25,11,0,0),
-d(2021,4,4,12,0,0),
-d(2021,10,31,11,0,0),
-d(2022,4,3,12,0,0),
-d(2022,10,30,11,0,0),
-d(2023,4,2,12,0,0),
-d(2023,10,29,11,0,0),
-d(2024,4,7,12,0,0),
-d(2024,10,27,11,0,0),
-d(2025,4,6,12,0,0),
-d(2025,10,26,11,0,0),
-d(2026,4,5,12,0,0),
-d(2026,10,25,11,0,0),
-d(2027,4,4,12,0,0),
-d(2027,10,31,11,0,0),
-d(2028,4,2,12,0,0),
-d(2028,10,29,11,0,0),
-d(2029,4,1,12,0,0),
-d(2029,10,28,11,0,0),
-d(2030,4,7,12,0,0),
-d(2030,10,27,11,0,0),
-d(2031,4,6,12,0,0),
-d(2031,10,26,11,0,0),
-d(2032,4,4,12,0,0),
-d(2032,10,31,11,0,0),
-d(2033,4,3,12,0,0),
-d(2033,10,30,11,0,0),
-d(2034,4,2,12,0,0),
-d(2034,10,29,11,0,0),
-d(2035,4,1,12,0,0),
-d(2035,10,28,11,0,0),
-d(2036,4,6,12,0,0),
-d(2036,10,26,11,0,0),
-d(2037,4,5,12,0,0),
-d(2037,10,25,11,0,0),
+d(2007,3,11,12,0,0),
+d(2007,11,4,11,0,0),
+d(2008,3,9,12,0,0),
+d(2008,11,2,11,0,0),
+d(2009,3,8,12,0,0),
+d(2009,11,1,11,0,0),
+d(2010,3,14,12,0,0),
+d(2010,11,7,11,0,0),
+d(2011,3,13,12,0,0),
+d(2011,11,6,11,0,0),
+d(2012,3,11,12,0,0),
+d(2012,11,4,11,0,0),
+d(2013,3,10,12,0,0),
+d(2013,11,3,11,0,0),
+d(2014,3,9,12,0,0),
+d(2014,11,2,11,0,0),
+d(2015,3,8,12,0,0),
+d(2015,11,1,11,0,0),
+d(2016,3,13,12,0,0),
+d(2016,11,6,11,0,0),
+d(2017,3,12,12,0,0),
+d(2017,11,5,11,0,0),
+d(2018,3,11,12,0,0),
+d(2018,11,4,11,0,0),
+d(2019,3,10,12,0,0),
+d(2019,11,3,11,0,0),
+d(2020,3,8,12,0,0),
+d(2020,11,1,11,0,0),
+d(2021,3,14,12,0,0),
+d(2021,11,7,11,0,0),
+d(2022,3,13,12,0,0),
+d(2022,11,6,11,0,0),
+d(2023,3,12,12,0,0),
+d(2023,11,5,11,0,0),
+d(2024,3,10,12,0,0),
+d(2024,11,3,11,0,0),
+d(2025,3,9,12,0,0),
+d(2025,11,2,11,0,0),
+d(2026,3,8,12,0,0),
+d(2026,11,1,11,0,0),
+d(2027,3,14,12,0,0),
+d(2027,11,7,11,0,0),
+d(2028,3,12,12,0,0),
+d(2028,11,5,11,0,0),
+d(2029,3,11,12,0,0),
+d(2029,11,4,11,0,0),
+d(2030,3,10,12,0,0),
+d(2030,11,3,11,0,0),
+d(2031,3,9,12,0,0),
+d(2031,11,2,11,0,0),
+d(2032,3,14,12,0,0),
+d(2032,11,7,11,0,0),
+d(2033,3,13,12,0,0),
+d(2033,11,6,11,0,0),
+d(2034,3,12,12,0,0),
+d(2034,11,5,11,0,0),
+d(2035,3,11,12,0,0),
+d(2035,11,4,11,0,0),
+d(2036,3,9,12,0,0),
+d(2036,11,2,11,0,0),
+d(2037,3,8,12,0,0),
+d(2037,11,1,11,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Central.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Central.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Central.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/US/East_minus_Indiana.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/East_minus_Indiana.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/East_minus_Indiana.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -44,6 +44,70 @@
 d(1969,10,26,6,0,0),
 d(1970,4,26,7,0,0),
 d(1970,10,25,6,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -82,6 +146,70 @@
 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,'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'),
         ]
 
 East_minus_Indiana = East_minus_Indiana()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Eastern.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Eastern.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Eastern.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/pytz/zoneinfo/US/Indiana_minus_Starke.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Indiana_minus_Starke.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Indiana_minus_Starke.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -99,6 +99,70 @@
 d(1990,10,28,7,0,0),
 d(1991,4,7,8,0,0),
 d(1991,10,27,7,0,0),
+d(2006,4,2,7,0,0),
+d(2006,10,29,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 = [
@@ -192,6 +256,70 @@
 i(-21600,0,'CST'),
 i(-18000,3600,'CDT'),
 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,'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'),
         ]
 
 Indiana_minus_Starke = Indiana_minus_Starke()

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Michigan.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Michigan.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Michigan.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -87,68 +87,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/branches/Zope-3.1/src/pytz/zoneinfo/US/Mountain.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Mountain.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Mountain.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -105,68 +105,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/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -133,68 +133,68 @@
 d(2005,10,30,9,0,0),
 d(2006,4,2,10,0,0),
 d(2006,10,29,9,0,0),
-d(2007,4,1,10,0,0),
-d(2007,10,28,9,0,0),
-d(2008,4,6,10,0,0),
-d(2008,10,26,9,0,0),
-d(2009,4,5,10,0,0),
-d(2009,10,25,9,0,0),
-d(2010,4,4,10,0,0),
-d(2010,10,31,9,0,0),
-d(2011,4,3,10,0,0),
-d(2011,10,30,9,0,0),
-d(2012,4,1,10,0,0),
-d(2012,10,28,9,0,0),
-d(2013,4,7,10,0,0),
-d(2013,10,27,9,0,0),
-d(2014,4,6,10,0,0),
-d(2014,10,26,9,0,0),
-d(2015,4,5,10,0,0),
-d(2015,10,25,9,0,0),
-d(2016,4,3,10,0,0),
-d(2016,10,30,9,0,0),
-d(2017,4,2,10,0,0),
-d(2017,10,29,9,0,0),
-d(2018,4,1,10,0,0),
-d(2018,10,28,9,0,0),
-d(2019,4,7,10,0,0),
-d(2019,10,27,9,0,0),
-d(2020,4,5,10,0,0),
-d(2020,10,25,9,0,0),
-d(2021,4,4,10,0,0),
-d(2021,10,31,9,0,0),
-d(2022,4,3,10,0,0),
-d(2022,10,30,9,0,0),
-d(2023,4,2,10,0,0),
-d(2023,10,29,9,0,0),
-d(2024,4,7,10,0,0),
-d(2024,10,27,9,0,0),
-d(2025,4,6,10,0,0),
-d(2025,10,26,9,0,0),
-d(2026,4,5,10,0,0),
-d(2026,10,25,9,0,0),
-d(2027,4,4,10,0,0),
-d(2027,10,31,9,0,0),
-d(2028,4,2,10,0,0),
-d(2028,10,29,9,0,0),
-d(2029,4,1,10,0,0),
-d(2029,10,28,9,0,0),
-d(2030,4,7,10,0,0),
-d(2030,10,27,9,0,0),
-d(2031,4,6,10,0,0),
-d(2031,10,26,9,0,0),
-d(2032,4,4,10,0,0),
-d(2032,10,31,9,0,0),
-d(2033,4,3,10,0,0),
-d(2033,10,30,9,0,0),
-d(2034,4,2,10,0,0),
-d(2034,10,29,9,0,0),
-d(2035,4,1,10,0,0),
-d(2035,10,28,9,0,0),
-d(2036,4,6,10,0,0),
-d(2036,10,26,9,0,0),
-d(2037,4,5,10,0,0),
-d(2037,10,25,9,0,0),
+d(2007,3,11,10,0,0),
+d(2007,11,4,9,0,0),
+d(2008,3,9,10,0,0),
+d(2008,11,2,9,0,0),
+d(2009,3,8,10,0,0),
+d(2009,11,1,9,0,0),
+d(2010,3,14,10,0,0),
+d(2010,11,7,9,0,0),
+d(2011,3,13,10,0,0),
+d(2011,11,6,9,0,0),
+d(2012,3,11,10,0,0),
+d(2012,11,4,9,0,0),
+d(2013,3,10,10,0,0),
+d(2013,11,3,9,0,0),
+d(2014,3,9,10,0,0),
+d(2014,11,2,9,0,0),
+d(2015,3,8,10,0,0),
+d(2015,11,1,9,0,0),
+d(2016,3,13,10,0,0),
+d(2016,11,6,9,0,0),
+d(2017,3,12,10,0,0),
+d(2017,11,5,9,0,0),
+d(2018,3,11,10,0,0),
+d(2018,11,4,9,0,0),
+d(2019,3,10,10,0,0),
+d(2019,11,3,9,0,0),
+d(2020,3,8,10,0,0),
+d(2020,11,1,9,0,0),
+d(2021,3,14,10,0,0),
+d(2021,11,7,9,0,0),
+d(2022,3,13,10,0,0),
+d(2022,11,6,9,0,0),
+d(2023,3,12,10,0,0),
+d(2023,11,5,9,0,0),
+d(2024,3,10,10,0,0),
+d(2024,11,3,9,0,0),
+d(2025,3,9,10,0,0),
+d(2025,11,2,9,0,0),
+d(2026,3,8,10,0,0),
+d(2026,11,1,9,0,0),
+d(2027,3,14,10,0,0),
+d(2027,11,7,9,0,0),
+d(2028,3,12,10,0,0),
+d(2028,11,5,9,0,0),
+d(2029,3,11,10,0,0),
+d(2029,11,4,9,0,0),
+d(2030,3,10,10,0,0),
+d(2030,11,3,9,0,0),
+d(2031,3,9,10,0,0),
+d(2031,11,2,9,0,0),
+d(2032,3,14,10,0,0),
+d(2032,11,7,9,0,0),
+d(2033,3,13,10,0,0),
+d(2033,11,6,9,0,0),
+d(2034,3,12,10,0,0),
+d(2034,11,5,9,0,0),
+d(2035,3,11,10,0,0),
+d(2035,11,4,9,0,0),
+d(2036,3,9,10,0,0),
+d(2036,11,2,9,0,0),
+d(2037,3,8,10,0,0),
+d(2037,11,1,9,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific_minus_New.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific_minus_New.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/US/Pacific_minus_New.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -133,68 +133,68 @@
 d(2005,10,30,9,0,0),
 d(2006,4,2,10,0,0),
 d(2006,10,29,9,0,0),
-d(2007,4,1,10,0,0),
-d(2007,10,28,9,0,0),
-d(2008,4,6,10,0,0),
-d(2008,10,26,9,0,0),
-d(2009,4,5,10,0,0),
-d(2009,10,25,9,0,0),
-d(2010,4,4,10,0,0),
-d(2010,10,31,9,0,0),
-d(2011,4,3,10,0,0),
-d(2011,10,30,9,0,0),
-d(2012,4,1,10,0,0),
-d(2012,10,28,9,0,0),
-d(2013,4,7,10,0,0),
-d(2013,10,27,9,0,0),
-d(2014,4,6,10,0,0),
-d(2014,10,26,9,0,0),
-d(2015,4,5,10,0,0),
-d(2015,10,25,9,0,0),
-d(2016,4,3,10,0,0),
-d(2016,10,30,9,0,0),
-d(2017,4,2,10,0,0),
-d(2017,10,29,9,0,0),
-d(2018,4,1,10,0,0),
-d(2018,10,28,9,0,0),
-d(2019,4,7,10,0,0),
-d(2019,10,27,9,0,0),
-d(2020,4,5,10,0,0),
-d(2020,10,25,9,0,0),
-d(2021,4,4,10,0,0),
-d(2021,10,31,9,0,0),
-d(2022,4,3,10,0,0),
-d(2022,10,30,9,0,0),
-d(2023,4,2,10,0,0),
-d(2023,10,29,9,0,0),
-d(2024,4,7,10,0,0),
-d(2024,10,27,9,0,0),
-d(2025,4,6,10,0,0),
-d(2025,10,26,9,0,0),
-d(2026,4,5,10,0,0),
-d(2026,10,25,9,0,0),
-d(2027,4,4,10,0,0),
-d(2027,10,31,9,0,0),
-d(2028,4,2,10,0,0),
-d(2028,10,29,9,0,0),
-d(2029,4,1,10,0,0),
-d(2029,10,28,9,0,0),
-d(2030,4,7,10,0,0),
-d(2030,10,27,9,0,0),
-d(2031,4,6,10,0,0),
-d(2031,10,26,9,0,0),
-d(2032,4,4,10,0,0),
-d(2032,10,31,9,0,0),
-d(2033,4,3,10,0,0),
-d(2033,10,30,9,0,0),
-d(2034,4,2,10,0,0),
-d(2034,10,29,9,0,0),
-d(2035,4,1,10,0,0),
-d(2035,10,28,9,0,0),
-d(2036,4,6,10,0,0),
-d(2036,10,26,9,0,0),
-d(2037,4,5,10,0,0),
-d(2037,10,25,9,0,0),
+d(2007,3,11,10,0,0),
+d(2007,11,4,9,0,0),
+d(2008,3,9,10,0,0),
+d(2008,11,2,9,0,0),
+d(2009,3,8,10,0,0),
+d(2009,11,1,9,0,0),
+d(2010,3,14,10,0,0),
+d(2010,11,7,9,0,0),
+d(2011,3,13,10,0,0),
+d(2011,11,6,9,0,0),
+d(2012,3,11,10,0,0),
+d(2012,11,4,9,0,0),
+d(2013,3,10,10,0,0),
+d(2013,11,3,9,0,0),
+d(2014,3,9,10,0,0),
+d(2014,11,2,9,0,0),
+d(2015,3,8,10,0,0),
+d(2015,11,1,9,0,0),
+d(2016,3,13,10,0,0),
+d(2016,11,6,9,0,0),
+d(2017,3,12,10,0,0),
+d(2017,11,5,9,0,0),
+d(2018,3,11,10,0,0),
+d(2018,11,4,9,0,0),
+d(2019,3,10,10,0,0),
+d(2019,11,3,9,0,0),
+d(2020,3,8,10,0,0),
+d(2020,11,1,9,0,0),
+d(2021,3,14,10,0,0),
+d(2021,11,7,9,0,0),
+d(2022,3,13,10,0,0),
+d(2022,11,6,9,0,0),
+d(2023,3,12,10,0,0),
+d(2023,11,5,9,0,0),
+d(2024,3,10,10,0,0),
+d(2024,11,3,9,0,0),
+d(2025,3,9,10,0,0),
+d(2025,11,2,9,0,0),
+d(2026,3,8,10,0,0),
+d(2026,11,1,9,0,0),
+d(2027,3,14,10,0,0),
+d(2027,11,7,9,0,0),
+d(2028,3,12,10,0,0),
+d(2028,11,5,9,0,0),
+d(2029,3,11,10,0,0),
+d(2029,11,4,9,0,0),
+d(2030,3,10,10,0,0),
+d(2030,11,3,9,0,0),
+d(2031,3,9,10,0,0),
+d(2031,11,2,9,0,0),
+d(2032,3,14,10,0,0),
+d(2032,11,7,9,0,0),
+d(2033,3,13,10,0,0),
+d(2033,11,6,9,0,0),
+d(2034,3,12,10,0,0),
+d(2034,11,5,9,0,0),
+d(2035,3,11,10,0,0),
+d(2035,11,4,9,0,0),
+d(2036,3,9,10,0,0),
+d(2036,11,2,9,0,0),
+d(2037,3,8,10,0,0),
+d(2037,11,1,9,0,0),
         ]
 
     _transition_info = [

Modified: Zope3/branches/Zope-3.1/src/pytz/zoneinfo/posixrules.py
===================================================================
--- Zope3/branches/Zope-3.1/src/pytz/zoneinfo/posixrules.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/pytz/zoneinfo/posixrules.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -183,68 +183,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/branches/Zope-3.1/src/zope/i18n/format.py
===================================================================
--- Zope3/branches/Zope-3.1/src/zope/i18n/format.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/zope/i18n/format.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -130,6 +130,7 @@
 
         # Handle timezones
         tzinfo = None
+        pytz_tzinfo = False # If True, we should use pytz specific syntax
         tz_entry = _findFormattingCharacterInPattern('z', bin_pattern)
         if ordered[3:] != [None, None, None, None] and tz_entry:
             length = tz_entry[0][1]
@@ -137,32 +138,54 @@
             if length == 1:
                 hours, mins = int(value[:-2]), int(value[-2:])
                 delta = datetime.timedelta(hours=hours, minutes=mins)
+                # XXX: I think this is making an unpickable tzinfo.
+                # Note that StaticTzInfo is not part of the exposed pytz API.
                 tzinfo = pytz.tzinfo.StaticTzInfo()
                 tzinfo._utcoffset = delta
+                pytz_tzinfo = True
             elif length == 2:
                 hours, mins = int(value[:-3]), int(value[-2:])
                 delta = datetime.timedelta(hours=hours, minutes=mins)
+                # XXX: I think this is making an unpickable tzinfo.
+                # Note that StaticTzInfo is not part of the exposed pytz API.
                 tzinfo = pytz.tzinfo.StaticTzInfo()
                 tzinfo._utcoffset = delta
+                pytz_tzinfo = True
             else:
-                if value in pytz.all_timezones:
+                try:
                     tzinfo = pytz.timezone(value)
-                else:
+                    pytz_tzinfo = True
+                except KeyError:
                     # TODO: Find timezones using locale information
                     pass
-                    
 
         # Create a date/time object from the data
+        # If we have a pytz tzinfo, we need to invoke localize() as per
+        # the pytz documentation on creating local times.
+        # NB. If we are in an end-of-DST transition period, we have a 50%
+        # chance of getting a time 1 hour out here, but that is the price
+        # paid for dealing with localtimes.
         if ordered[3:] == [None, None, None, None]:
             return datetime.date(*[e or 0 for e in ordered[:3]])
         elif ordered[:3] == [None, None, None]:
-            return datetime.time(*[e or 0 for e in ordered[3:]],
-                                 **{'tzinfo' :tzinfo})
+            if pytz_tzinfo:
+                return tzinfo.localize(
+                    datetime.time(*[e or 0 for e in ordered[3:]])
+                    )
+            else:
+                return datetime.time(
+                    *[e or 0 for e in ordered[3:]], **{'tzinfo' :tzinfo}
+                    )
         else:
-            return datetime.datetime(*[e or 0 for e in ordered],
-                                     **{'tzinfo' :tzinfo})
+            if pytz_tzinfo:
+                return tzinfo.localize(datetime.datetime(
+                    *[e or 0 for e in ordered]
+                    ))
+            else:
+                return datetime.datetime(
+                    *[e or 0 for e in ordered], **{'tzinfo' :tzinfo}
+                    )
 
-
     def format(self, obj, pattern=None):
         "See zope.i18n.interfaces.IFormat"
         # Make or get binary form of datetime pattern
@@ -599,7 +622,7 @@
     week_in_month = (dt.day + 6 - dt.weekday()) / 7 + 1
 
     # Getting the timezone right
-    tzinfo = dt.tzinfo or pytz.reference.utc
+    tzinfo = dt.tzinfo or pytz.utc
     tz_secs = tzinfo.utcoffset(dt).seconds
     tz_secs = (tz_secs > 12*3600) and tz_secs-24*3600 or tz_secs
     tz_mins = int(math.fabs(tz_secs % 3600 / 60))

Modified: Zope3/branches/Zope-3.1/src/zope/i18n/tests/test_formats.py
===================================================================
--- Zope3/branches/Zope-3.1/src/zope/i18n/tests/test_formats.py	2005-09-07 17:59:18 UTC (rev 38348)
+++ Zope3/branches/Zope-3.1/src/zope/i18n/tests/test_formats.py	2005-09-07 18:27:36 UTC (rev 38349)
@@ -302,19 +302,41 @@
         self.assertEqual(dt.tzinfo.tzname(dt), None)
 
     def testParseTimeZoneNames(self):
+        # Note that EST is a deprecated timezone name since it is a US
+        # interpretation (other countries also use the EST timezone
+        # abbreviation)
         dt = self.format.parse('01.01.2003 09:48 EST', 'dd.MM.yyyy HH:mm zzz')
-        self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-6))
+        self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-5))
         self.assertEqual(dt.tzinfo.zone, 'EST')
-        # I think this is wrong due to a bug in pytz
-        self.assertEqual(dt.tzinfo.tzname(dt), 'CST')
+        self.assertEqual(dt.tzinfo.tzname(dt), 'EST')
 
         dt = self.format.parse('01.01.2003 09:48 US/Eastern',
                                'dd.MM.yyyy HH:mm zzzz')
         self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-5))
         self.assertEqual(dt.tzinfo.zone, 'US/Eastern')
-        # I think this is wrong due to a bug in pytz
         self.assertEqual(dt.tzinfo.tzname(dt), 'EST')
 
+        dt = self.format.parse('01.01.2003 09:48 Australia/Sydney',
+                               'dd.MM.yyyy HH:mm zzzz')
+        self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=11))
+        self.assertEqual(dt.tzinfo.zone, 'Australia/Sydney')
+        self.assertEqual(dt.tzinfo.tzname(dt), 'EST')
+
+        # Note that historical and future (as far as known)
+        # timezones are handled happily using the pytz timezone database
+        # US DST transition points are changing in 2007
+        dt = self.format.parse('01.04.2006 09:48 US/Eastern',
+                               'dd.MM.yyyy HH:mm zzzz')
+        self.assertEqual(dt.tzinfo.zone, 'US/Eastern')
+        self.assertEqual(dt.tzinfo.tzname(dt), 'EST')
+        self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-5))
+        dt = self.format.parse('01.04.2007 09:48 US/Eastern',
+                               'dd.MM.yyyy HH:mm zzzz')
+        self.assertEqual(dt.tzinfo.zone, 'US/Eastern')
+        self.assertEqual(dt.tzinfo.tzname(dt), 'EDT')
+        self.assertEqual(dt.tzinfo.utcoffset(dt), datetime.timedelta(hours=-4))
+
+
     def testDateTimeParseError(self):
         self.assertRaises(DateTimeParseError,
             self.format.parse, '02.01.03 21:48', 'dd.MM.yyyy HH:mm')



More information about the Zope3-Checkins mailing list