[Zope3-checkins] SVN: Zope3/branches/3.3/src/pytz/ Merge
69730:69731 from trunk (Update pytz to 2006j)
Stuart Bishop
stuart at stuartbishop.net
Wed Aug 23 08:52:54 EDT 2006
Log message for revision 69732:
Merge 69730:69731 from trunk (Update pytz to 2006j)
Changed:
U Zope3/branches/3.3/src/pytz/__init__.py
U Zope3/branches/3.3/src/pytz/locales/pytz.pot
U Zope3/branches/3.3/src/pytz/reference.py
U Zope3/branches/3.3/src/pytz/tests/test_docs.py
U Zope3/branches/3.3/src/pytz/tests/test_tzinfo.py
U Zope3/branches/3.3/src/pytz/zone.tab
A Zope3/branches/3.3/src/pytz/zoneinfo/America/Atikokan.py
A Zope3/branches/3.3/src/pytz/zoneinfo/America/Blanc_minus_Sablon.py
U Zope3/branches/3.3/src/pytz/zoneinfo/America/Coral_Harbour.py
U Zope3/branches/3.3/src/pytz/zoneinfo/America/Moncton.py
U Zope3/branches/3.3/src/pytz/zoneinfo/America/Scoresbysund.py
U Zope3/branches/3.3/src/pytz/zoneinfo/America/Tegucigalpa.py
U Zope3/branches/3.3/src/pytz/zoneinfo/Atlantic/Bermuda.py
A Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Guernsey.py
A Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Isle_of_Man.py
A Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Jersey.py
U Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Samara.py
A Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Volgograd.py
-=-
Modified: Zope3/branches/3.3/src/pytz/__init__.py
===================================================================
--- Zope3/branches/3.3/src/pytz/__init__.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/__init__.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -9,7 +9,7 @@
'''
# The Olson database has historically been updated about 4 times a year
-OLSON_VERSION = '2006g'
+OLSON_VERSION = '2006j'
VERSION = OLSON_VERSION
#VERSION = OLSON_VERSION + '.2'
__version__ = OLSON_VERSION
@@ -195,8 +195,12 @@
"""
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):
+ try:
+ from pkg_resources import resource_stream
+ zone_tab = resource_stream(__name__, 'zone.tab')
+ except ImportError:
+ zone_tab = open(os.path.join(os.path.dirname(__file__), 'zone.tab'))
+ for line in zone_tab:
if line.startswith('#'):
continue
code, coordinates, zone = line.split(None, 4)[:3]
@@ -380,11 +384,13 @@
'America/Araguaina',
'America/Aruba',
'America/Asuncion',
+ 'America/Atikokan',
'America/Atka',
'America/Bahia',
'America/Barbados',
'America/Belem',
'America/Belize',
+ 'America/Blanc-Sablon',
'America/Boa_Vista',
'America/Bogota',
'America/Boise',
@@ -653,8 +659,11 @@
'Europe/Copenhagen',
'Europe/Dublin',
'Europe/Gibraltar',
+ 'Europe/Guernsey',
'Europe/Helsinki',
+ 'Europe/Isle_of_Man',
'Europe/Istanbul',
+ 'Europe/Jersey',
'Europe/Kaliningrad',
'Europe/Kiev',
'Europe/Lisbon',
@@ -688,6 +697,7 @@
'Europe/Vatican',
'Europe/Vienna',
'Europe/Vilnius',
+ 'Europe/Volgograd',
'Europe/Warsaw',
'Europe/Zagreb',
'Europe/Zaporozhye',
@@ -833,11 +843,13 @@
'America/Argentina/Ushuaia',
'America/Aruba',
'America/Asuncion',
+ 'America/Atikokan',
'America/Atka',
'America/Bahia',
'America/Barbados',
'America/Belem',
'America/Belize',
+ 'America/Blanc-Sablon',
'America/Boa_Vista',
'America/Bogota',
'America/Boise',
@@ -1159,8 +1171,11 @@
'Europe/Copenhagen',
'Europe/Dublin',
'Europe/Gibraltar',
+ 'Europe/Guernsey',
'Europe/Helsinki',
+ 'Europe/Isle_of_Man',
'Europe/Istanbul',
+ 'Europe/Jersey',
'Europe/Kaliningrad',
'Europe/Kiev',
'Europe/Lisbon',
@@ -1194,6 +1209,7 @@
'Europe/Vatican',
'Europe/Vienna',
'Europe/Vilnius',
+ 'Europe/Volgograd',
'Europe/Warsaw',
'Europe/Zagreb',
'Europe/Zaporozhye',
Modified: Zope3/branches/3.3/src/pytz/locales/pytz.pot
===================================================================
--- Zope3/branches/3.3/src/pytz/locales/pytz.pot 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/locales/pytz.pot 2006-08-23 12:52:52 UTC (rev 69732)
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
-"Project-Id-Version: pytz 2006g\n"
-"POT-Creation-Date: 2006-05-09 08:33+UTC\n"
+"Project-Id-Version: pytz 2006j\n"
+"POT-Creation-Date: 2006-08-23 06:28+UTC\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -215,6 +215,9 @@
msgid "America/Asuncion"
msgstr ""
+msgid "America/Atikokan"
+msgstr ""
+
msgid "America/Atka"
msgstr ""
@@ -230,6 +233,9 @@
msgid "America/Belize"
msgstr ""
+msgid "America/Blanc-Sablon"
+msgstr ""
+
msgid "America/Boa_Vista"
msgstr ""
@@ -1193,12 +1199,21 @@
msgid "Europe/Gibraltar"
msgstr ""
+msgid "Europe/Guernsey"
+msgstr ""
+
msgid "Europe/Helsinki"
msgstr ""
+msgid "Europe/Isle_of_Man"
+msgstr ""
+
msgid "Europe/Istanbul"
msgstr ""
+msgid "Europe/Jersey"
+msgstr ""
+
msgid "Europe/Kaliningrad"
msgstr ""
@@ -1298,6 +1313,9 @@
msgid "Europe/Vilnius"
msgstr ""
+msgid "Europe/Volgograd"
+msgstr ""
+
msgid "Europe/Warsaw"
msgstr ""
Modified: Zope3/branches/3.3/src/pytz/reference.py
===================================================================
--- Zope3/branches/3.3/src/pytz/reference.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/reference.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -1,8 +1,7 @@
'''
-$Id: reference.py,v 1.2 2004/10/25 04:14:00 zenzen Exp $
-
Reference tzinfo implementations from the Python docs.
-Used for testing against.
+Used for testing against as they are only correct for the years
+1987 to 2006. Do not use these for real code.
'''
from datetime import tzinfo, timedelta, datetime
@@ -124,5 +123,5 @@
Eastern = USTimeZone(-5, "Eastern", "EST", "EDT")
Central = USTimeZone(-6, "Central", "CST", "CDT")
Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
-Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
+Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
Modified: Zope3/branches/3.3/src/pytz/tests/test_docs.py
===================================================================
--- Zope3/branches/3.3/src/pytz/tests/test_docs.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/tests/test_docs.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -27,7 +27,7 @@
return README
if __name__ == '__main__':
- sys.path.insert(0, os.path.normpath(os.path.join(
+ sys.path.insert(0, os.path.abspath(os.path.join(
this_dir, os.pardir, os.pardir
)))
unittest.main(defaultTest='README')
Modified: Zope3/branches/3.3/src/pytz/tests/test_tzinfo.py
===================================================================
--- Zope3/branches/3.3/src/pytz/tests/test_tzinfo.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/tests/test_tzinfo.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -8,12 +8,12 @@
if __name__ == '__main__':
# Only munge path if invoked as a script. Testrunners should have setup
# the paths already
- sys.path.insert(0, os.path.join(os.pardir, os.pardir))
+ sys.path.insert(0, os.path.abspath(os.path.join(os.pardir, os.pardir)))
import pytz
from pytz import reference
-EXPECTED_VERSION='2006g'
+EXPECTED_VERSION='2006j'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'
Modified: Zope3/branches/3.3/src/pytz/zone.tab
===================================================================
--- Zope3/branches/3.3/src/pytz/zone.tab 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zone.tab 2006-08-23 12:52:52 UTC (rev 69732)
@@ -1,4 +1,4 @@
-# @(#)zone.tab 8.3
+# %W%
#
# TZ zone descriptions
#
@@ -44,7 +44,7 @@
AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF)
AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
AR -2411-06518 America/Argentina/Jujuy Jujuy (JY)
-AR -3124-06411 America/Argentina/Tucuman Tucuman (TM)
+AR -2649-06513 America/Argentina/Tucuman Tucuman (TM)
AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH)
AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR)
AR -3132-06831 America/Argentina/San_Juan San Juan (SJ)
@@ -99,27 +99,28 @@
BW -2545+02555 Africa/Gaborone
BY +5354+02734 Europe/Minsk
BZ +1730-08812 America/Belize
-CA +4734-05243 America/St_Johns Newfoundland Island
-CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), W Labrador, E Quebec & PEI
+CA +4734-05243 America/St_Johns Newfoundland Time, including SE Labrador
+CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), PEI
CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
CA +4606-06447 America/Moncton Atlantic Time - New Brunswick
-CA +5320-06025 America/Goose_Bay Atlantic Time - E Labrador
+CA +5320-06025 America/Goose_Bay Atlantic Time - Labrador - most locations
+CA +5125-05707 America/Blanc-Sablon Atlantic Standard Time - Quebec - Lower North Shore
CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations
CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations
CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario
CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut
CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut
-CA +6408-08310 America/Coral_Harbour Eastern Standard Time - Southampton Island
-CA +6245-09210 America/Rankin_Inlet Central Time - central Nunavut
+CA +484531-0913718 America/Atikokan Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA +624900-0920459 America/Rankin_Inlet Central Time - central Nunavut
CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario
-CA +4843-09429 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario
+CA +4843-09434 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario
CA +6903-10505 America/Cambridge_Bay Central Time - west Nunavut
CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations
CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest
CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan
CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories
-CA +6825-11330 America/Inuvik Mountain Time - west Northwest Territories
+CA +682059-1334300 America/Inuvik Mountain Time - west Northwest Territories
CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
CA +4916-12307 America/Vancouver Pacific Time - west British Columbia
CA +6043-13503 America/Whitehorse Pacific Time - south Yukon
@@ -136,10 +137,10 @@
CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez
CM +0403+00942 Africa/Douala
CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc.
-CN +4545+12641 Asia/Harbin Heilongjiang
-CN +2934+10635 Asia/Chongqing central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
-CN +4348+08735 Asia/Urumqi Tibet & most of Xinjiang Uyghur
-CN +3929+07559 Asia/Kashgar southwest Xinjiang Uyghur
+CN +4545+12641 Asia/Harbin Heilongjiang (except Mohe), Jilin
+CN +2934+10635 Asia/Chongqing central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.
+CN +4348+08735 Asia/Urumqi most of Tibet & Xinjiang
+CN +3929+07559 Asia/Kashgar west Tibet & Xinjiang
CO +0436-07405 America/Bogota
CR +0956-08405 America/Costa_Rica
CS +4450+02030 Europe/Belgrade
@@ -177,11 +178,12 @@
GD +1203-06145 America/Grenada
GE +4143+04449 Asia/Tbilisi
GF +0456-05220 America/Cayenne
+GG +4927-00232 Europe/Guernsey
GH +0533-00013 Africa/Accra
GI +3608-00521 Europe/Gibraltar
GL +6411-05144 America/Godthab most locations
GL +7646-01840 America/Danmarkshavn east coast, north of Scoresbysund
-GL +7030-02215 America/Scoresbysund Scoresbysund / Ittoqqortoormiit
+GL +7029-02158 America/Scoresbysund Scoresbysund / Ittoqqortoormiit
GL +7634-06847 America/Thule Thule / Pituffik
GM +1328-01639 Africa/Banjul
GN +0931-01343 Africa/Conakry
@@ -204,12 +206,14 @@
ID -0232+14042 Asia/Jayapura Irian Jaya & the Moluccas
IE +5320-00615 Europe/Dublin
IL +3146+03514 Asia/Jerusalem
+IM +5409-00428 Europe/Isle_of_Man
IN +2232+08822 Asia/Calcutta
IO -0720+07225 Indian/Chagos
IQ +3321+04425 Asia/Baghdad
IR +3540+05126 Asia/Tehran
IS +6409-02151 Atlantic/Reykjavik
IT +4154+01229 Europe/Rome
+JE +4912-00237 Europe/Jersey
JM +1800-07648 America/Jamaica
JO +3157+03556 Asia/Amman
JP +353916+1394441 Asia/Tokyo
@@ -310,7 +314,8 @@
RO +4426+02606 Europe/Bucharest
RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad
RU +5545+03735 Europe/Moscow Moscow+00 - west Russia
-RU +5312+05009 Europe/Samara Moscow+01 - Caspian Sea
+RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea
+RU +5312+05009 Europe/Samara Moscow+01 - Samara, Udmurtia
RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals
RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia
RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk
Copied: Zope3/branches/3.3/src/pytz/zoneinfo/America/Atikokan.py (from rev 69731, Zope3/trunk/src/pytz/zoneinfo/America/Atikokan.py)
Copied: Zope3/branches/3.3/src/pytz/zoneinfo/America/Blanc_minus_Sablon.py (from rev 69731, Zope3/trunk/src/pytz/zoneinfo/America/Blanc_minus_Sablon.py)
Modified: Zope3/branches/3.3/src/pytz/zoneinfo/America/Coral_Harbour.py
===================================================================
--- Zope3/branches/3.3/src/pytz/zoneinfo/America/Coral_Harbour.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zoneinfo/America/Coral_Harbour.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -10,24 +10,22 @@
_utc_transition_times = [
d(1,1,1,0,0,0),
-d(1918,4,14,7,0,0),
-d(1918,10,27,6,0,0),
-d(1919,5,25,7,0,0),
-d(1919,11,1,4,0,0),
-d(1942,2,9,7,0,0),
+d(1918,4,14,8,0,0),
+d(1918,10,31,7,0,0),
+d(1940,9,29,6,0,0),
+d(1942,2,9,8,0,0),
d(1945,8,14,23,0,0),
-d(1945,9,30,6,0,0),
+d(1945,9,30,7,0,0),
]
_transition_info = [
+i(-21600,0,'CST'),
+i(-18000,3600,'CDT'),
+i(-21600,0,'CST'),
+i(-18000,3600,'CDT'),
+i(-18000,3600,'CWT'),
+i(-18000,3600,'CPT'),
i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EDT'),
-i(-18000,0,'EST'),
-i(-14400,3600,'EWT'),
-i(-14400,3600,'EPT'),
-i(-18000,0,'EST'),
]
Coral_Harbour = Coral_Harbour()
Modified: Zope3/branches/3.3/src/pytz/zoneinfo/America/Moncton.py
===================================================================
--- Zope3/branches/3.3/src/pytz/zoneinfo/America/Moncton.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zoneinfo/America/Moncton.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -154,68 +154,68 @@
d(2005,10,30,3,1,0),
d(2006,4,2,4,1,0),
d(2006,10,29,3,1,0),
-d(2007,3,11,4,1,0),
-d(2007,11,4,3,1,0),
-d(2008,3,9,4,1,0),
-d(2008,11,2,3,1,0),
-d(2009,3,8,4,1,0),
-d(2009,11,1,3,1,0),
-d(2010,3,14,4,1,0),
-d(2010,11,7,3,1,0),
-d(2011,3,13,4,1,0),
-d(2011,11,6,3,1,0),
-d(2012,3,11,4,1,0),
-d(2012,11,4,3,1,0),
-d(2013,3,10,4,1,0),
-d(2013,11,3,3,1,0),
-d(2014,3,9,4,1,0),
-d(2014,11,2,3,1,0),
-d(2015,3,8,4,1,0),
-d(2015,11,1,3,1,0),
-d(2016,3,13,4,1,0),
-d(2016,11,6,3,1,0),
-d(2017,3,12,4,1,0),
-d(2017,11,5,3,1,0),
-d(2018,3,11,4,1,0),
-d(2018,11,4,3,1,0),
-d(2019,3,10,4,1,0),
-d(2019,11,3,3,1,0),
-d(2020,3,8,4,1,0),
-d(2020,11,1,3,1,0),
-d(2021,3,14,4,1,0),
-d(2021,11,7,3,1,0),
-d(2022,3,13,4,1,0),
-d(2022,11,6,3,1,0),
-d(2023,3,12,4,1,0),
-d(2023,11,5,3,1,0),
-d(2024,3,10,4,1,0),
-d(2024,11,3,3,1,0),
-d(2025,3,9,4,1,0),
-d(2025,11,2,3,1,0),
-d(2026,3,8,4,1,0),
-d(2026,11,1,3,1,0),
-d(2027,3,14,4,1,0),
-d(2027,11,7,3,1,0),
-d(2028,3,12,4,1,0),
-d(2028,11,5,3,1,0),
-d(2029,3,11,4,1,0),
-d(2029,11,4,3,1,0),
-d(2030,3,10,4,1,0),
-d(2030,11,3,3,1,0),
-d(2031,3,9,4,1,0),
-d(2031,11,2,3,1,0),
-d(2032,3,14,4,1,0),
-d(2032,11,7,3,1,0),
-d(2033,3,13,4,1,0),
-d(2033,11,6,3,1,0),
-d(2034,3,12,4,1,0),
-d(2034,11,5,3,1,0),
-d(2035,3,11,4,1,0),
-d(2035,11,4,3,1,0),
-d(2036,3,9,4,1,0),
-d(2036,11,2,3,1,0),
-d(2037,3,8,4,1,0),
-d(2037,11,1,3,1,0),
+d(2007,3,11,6,0,0),
+d(2007,11,4,5,0,0),
+d(2008,3,9,6,0,0),
+d(2008,11,2,5,0,0),
+d(2009,3,8,6,0,0),
+d(2009,11,1,5,0,0),
+d(2010,3,14,6,0,0),
+d(2010,11,7,5,0,0),
+d(2011,3,13,6,0,0),
+d(2011,11,6,5,0,0),
+d(2012,3,11,6,0,0),
+d(2012,11,4,5,0,0),
+d(2013,3,10,6,0,0),
+d(2013,11,3,5,0,0),
+d(2014,3,9,6,0,0),
+d(2014,11,2,5,0,0),
+d(2015,3,8,6,0,0),
+d(2015,11,1,5,0,0),
+d(2016,3,13,6,0,0),
+d(2016,11,6,5,0,0),
+d(2017,3,12,6,0,0),
+d(2017,11,5,5,0,0),
+d(2018,3,11,6,0,0),
+d(2018,11,4,5,0,0),
+d(2019,3,10,6,0,0),
+d(2019,11,3,5,0,0),
+d(2020,3,8,6,0,0),
+d(2020,11,1,5,0,0),
+d(2021,3,14,6,0,0),
+d(2021,11,7,5,0,0),
+d(2022,3,13,6,0,0),
+d(2022,11,6,5,0,0),
+d(2023,3,12,6,0,0),
+d(2023,11,5,5,0,0),
+d(2024,3,10,6,0,0),
+d(2024,11,3,5,0,0),
+d(2025,3,9,6,0,0),
+d(2025,11,2,5,0,0),
+d(2026,3,8,6,0,0),
+d(2026,11,1,5,0,0),
+d(2027,3,14,6,0,0),
+d(2027,11,7,5,0,0),
+d(2028,3,12,6,0,0),
+d(2028,11,5,5,0,0),
+d(2029,3,11,6,0,0),
+d(2029,11,4,5,0,0),
+d(2030,3,10,6,0,0),
+d(2030,11,3,5,0,0),
+d(2031,3,9,6,0,0),
+d(2031,11,2,5,0,0),
+d(2032,3,14,6,0,0),
+d(2032,11,7,5,0,0),
+d(2033,3,13,6,0,0),
+d(2033,11,6,5,0,0),
+d(2034,3,12,6,0,0),
+d(2034,11,5,5,0,0),
+d(2035,3,11,6,0,0),
+d(2035,11,4,5,0,0),
+d(2036,3,9,6,0,0),
+d(2036,11,2,5,0,0),
+d(2037,3,8,6,0,0),
+d(2037,11,1,5,0,0),
]
_transition_info = [
Modified: Zope3/branches/3.3/src/pytz/zoneinfo/America/Scoresbysund.py
===================================================================
--- Zope3/branches/3.3/src/pytz/zoneinfo/America/Scoresbysund.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zoneinfo/America/Scoresbysund.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -10,7 +10,7 @@
_utc_transition_times = [
d(1,1,1,0,0,0),
-d(1916,7,28,1,29,0),
+d(1916,7,28,1,27,52),
d(1980,4,6,4,0,0),
d(1980,9,28,4,0,0),
d(1981,3,29,2,0,0),
@@ -130,7 +130,7 @@
]
_transition_info = [
-i(-5340,0,'LMT'),
+i(-5280,0,'LMT'),
i(-7200,0,'CGT'),
i(-3600,3600,'CGST'),
i(-7200,0,'CGT'),
Modified: Zope3/branches/3.3/src/pytz/zoneinfo/America/Tegucigalpa.py
===================================================================
--- Zope3/branches/3.3/src/pytz/zoneinfo/America/Tegucigalpa.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zoneinfo/America/Tegucigalpa.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -16,7 +16,7 @@
d(1988,5,1,6,0,0),
d(1988,9,25,5,0,0),
d(2006,5,7,6,0,0),
-d(2006,9,24,5,0,0),
+d(2006,8,7,5,0,0),
]
_transition_info = [
Modified: Zope3/branches/3.3/src/pytz/zoneinfo/Atlantic/Bermuda.py
===================================================================
--- Zope3/branches/3.3/src/pytz/zoneinfo/Atlantic/Bermuda.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zoneinfo/Atlantic/Bermuda.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -77,68 +77,68 @@
d(2005,10,30,5,0,0),
d(2006,4,2,6,0,0),
d(2006,10,29,5,0,0),
-d(2007,4,1,6,0,0),
-d(2007,10,28,5,0,0),
-d(2008,4,6,6,0,0),
-d(2008,10,26,5,0,0),
-d(2009,4,5,6,0,0),
-d(2009,10,25,5,0,0),
-d(2010,4,4,6,0,0),
-d(2010,10,31,5,0,0),
-d(2011,4,3,6,0,0),
-d(2011,10,30,5,0,0),
-d(2012,4,1,6,0,0),
-d(2012,10,28,5,0,0),
-d(2013,4,7,6,0,0),
-d(2013,10,27,5,0,0),
-d(2014,4,6,6,0,0),
-d(2014,10,26,5,0,0),
-d(2015,4,5,6,0,0),
-d(2015,10,25,5,0,0),
-d(2016,4,3,6,0,0),
-d(2016,10,30,5,0,0),
-d(2017,4,2,6,0,0),
-d(2017,10,29,5,0,0),
-d(2018,4,1,6,0,0),
-d(2018,10,28,5,0,0),
-d(2019,4,7,6,0,0),
-d(2019,10,27,5,0,0),
-d(2020,4,5,6,0,0),
-d(2020,10,25,5,0,0),
-d(2021,4,4,6,0,0),
-d(2021,10,31,5,0,0),
-d(2022,4,3,6,0,0),
-d(2022,10,30,5,0,0),
-d(2023,4,2,6,0,0),
-d(2023,10,29,5,0,0),
-d(2024,4,7,6,0,0),
-d(2024,10,27,5,0,0),
-d(2025,4,6,6,0,0),
-d(2025,10,26,5,0,0),
-d(2026,4,5,6,0,0),
-d(2026,10,25,5,0,0),
-d(2027,4,4,6,0,0),
-d(2027,10,31,5,0,0),
-d(2028,4,2,6,0,0),
-d(2028,10,29,5,0,0),
-d(2029,4,1,6,0,0),
-d(2029,10,28,5,0,0),
-d(2030,4,7,6,0,0),
-d(2030,10,27,5,0,0),
-d(2031,4,6,6,0,0),
-d(2031,10,26,5,0,0),
-d(2032,4,4,6,0,0),
-d(2032,10,31,5,0,0),
-d(2033,4,3,6,0,0),
-d(2033,10,30,5,0,0),
-d(2034,4,2,6,0,0),
-d(2034,10,29,5,0,0),
-d(2035,4,1,6,0,0),
-d(2035,10,28,5,0,0),
-d(2036,4,6,6,0,0),
-d(2036,10,26,5,0,0),
-d(2037,4,5,6,0,0),
-d(2037,10,25,5,0,0),
+d(2007,3,11,6,0,0),
+d(2007,11,4,5,0,0),
+d(2008,3,9,6,0,0),
+d(2008,11,2,5,0,0),
+d(2009,3,8,6,0,0),
+d(2009,11,1,5,0,0),
+d(2010,3,14,6,0,0),
+d(2010,11,7,5,0,0),
+d(2011,3,13,6,0,0),
+d(2011,11,6,5,0,0),
+d(2012,3,11,6,0,0),
+d(2012,11,4,5,0,0),
+d(2013,3,10,6,0,0),
+d(2013,11,3,5,0,0),
+d(2014,3,9,6,0,0),
+d(2014,11,2,5,0,0),
+d(2015,3,8,6,0,0),
+d(2015,11,1,5,0,0),
+d(2016,3,13,6,0,0),
+d(2016,11,6,5,0,0),
+d(2017,3,12,6,0,0),
+d(2017,11,5,5,0,0),
+d(2018,3,11,6,0,0),
+d(2018,11,4,5,0,0),
+d(2019,3,10,6,0,0),
+d(2019,11,3,5,0,0),
+d(2020,3,8,6,0,0),
+d(2020,11,1,5,0,0),
+d(2021,3,14,6,0,0),
+d(2021,11,7,5,0,0),
+d(2022,3,13,6,0,0),
+d(2022,11,6,5,0,0),
+d(2023,3,12,6,0,0),
+d(2023,11,5,5,0,0),
+d(2024,3,10,6,0,0),
+d(2024,11,3,5,0,0),
+d(2025,3,9,6,0,0),
+d(2025,11,2,5,0,0),
+d(2026,3,8,6,0,0),
+d(2026,11,1,5,0,0),
+d(2027,3,14,6,0,0),
+d(2027,11,7,5,0,0),
+d(2028,3,12,6,0,0),
+d(2028,11,5,5,0,0),
+d(2029,3,11,6,0,0),
+d(2029,11,4,5,0,0),
+d(2030,3,10,6,0,0),
+d(2030,11,3,5,0,0),
+d(2031,3,9,6,0,0),
+d(2031,11,2,5,0,0),
+d(2032,3,14,6,0,0),
+d(2032,11,7,5,0,0),
+d(2033,3,13,6,0,0),
+d(2033,11,6,5,0,0),
+d(2034,3,12,6,0,0),
+d(2034,11,5,5,0,0),
+d(2035,3,11,6,0,0),
+d(2035,11,4,5,0,0),
+d(2036,3,9,6,0,0),
+d(2036,11,2,5,0,0),
+d(2037,3,8,6,0,0),
+d(2037,11,1,5,0,0),
]
_transition_info = [
Copied: Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Guernsey.py (from rev 69731, Zope3/trunk/src/pytz/zoneinfo/Europe/Guernsey.py)
Copied: Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Isle_of_Man.py (from rev 69731, Zope3/trunk/src/pytz/zoneinfo/Europe/Isle_of_Man.py)
Copied: Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Jersey.py (from rev 69731, Zope3/trunk/src/pytz/zoneinfo/Europe/Jersey.py)
Modified: Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Samara.py
===================================================================
--- Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Samara.py 2006-08-23 12:33:55 UTC (rev 69731)
+++ Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Samara.py 2006-08-23 12:52:52 UTC (rev 69732)
@@ -12,6 +12,7 @@
d(1,1,1,0,0,0),
d(1919,6,30,22,39,24),
d(1930,6,20,21,0,0),
+d(1935,1,26,20,0,0),
d(1981,3,31,20,0,0),
d(1981,9,30,19,0,0),
d(1982,3,31,20,0,0),
@@ -131,7 +132,8 @@
_transition_info = [
i(12060,0,'LMT'),
-i(10800,0,'KUYT'),
+i(10800,0,'SAMT'),
+i(14400,0,'SAMT'),
i(14400,0,'KUYT'),
i(18000,3600,'KUYST'),
i(14400,0,'KUYT'),
Copied: Zope3/branches/3.3/src/pytz/zoneinfo/Europe/Volgograd.py (from rev 69731, Zope3/trunk/src/pytz/zoneinfo/Europe/Volgograd.py)
More information about the Zope3-Checkins
mailing list