diff options
| -rw-r--r-- | elsie.nci.nih.gov/src/africa | 6 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/australasia | 74 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/backward | 4 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/europe | 33 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/iso3166.tab | 4 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/leapseconds | 72 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/northamerica | 87 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/southamerica | 17 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/tz-link.htm | 25 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/zdump.c | 4 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/zic.8 | 59 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/zic.8.txt | 53 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/zic.c | 11 | ||||
| -rw-r--r-- | elsie.nci.nih.gov/src/zone.tab | 16 | ||||
| -rw-r--r-- | src/pytz/__init__.py | 2 | ||||
| -rw-r--r-- | src/pytz/tests/test_tzinfo.py | 2 |
16 files changed, 327 insertions, 142 deletions
diff --git a/elsie.nci.nih.gov/src/africa b/elsie.nci.nih.gov/src/africa index d73d340..141365c 100644 --- a/elsie.nci.nih.gov/src/africa +++ b/elsie.nci.nih.gov/src/africa @@ -1,4 +1,4 @@ -# @(#)africa 8.5 +# @(#)africa 8.7 # <pre> # This data is by no means authoritative; if you think you know better, @@ -232,8 +232,8 @@ Zone Africa/Malabo 0:35:08 - LMT 1912 # Eritrea # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Africa/Asmera 2:35:32 - LMT 1870 - 2:35:32 - AMT 1890 # Asmera Mean Time +Zone Africa/Asmara 2:35:32 - LMT 1870 + 2:35:32 - AMT 1890 # Asmara Mean Time 2:35:20 - ADMT 1936 May 5 # Adis Dera MT 3:00 - EAT diff --git a/elsie.nci.nih.gov/src/australasia b/elsie.nci.nih.gov/src/australasia index 0f2c0f6..6377935 100644 --- a/elsie.nci.nih.gov/src/australasia +++ b/elsie.nci.nih.gov/src/australasia @@ -1,4 +1,4 @@ -# @(#)australasia 8.4 +# @(#)australasia 8.5 # <pre> # This file also includes Pacific islands. @@ -30,11 +30,6 @@ Zone Australia/Darwin 8:43:20 - LMT 1895 Feb 9:30 Aus CST # Western Australia # -# From Christopher Hunt (2006-11-21), after an advance warning -# from Jesper Norgaard Welen (2006-11-01): -# WA are trialing DST for three years. -# <http://www.parliament.wa.gov.au/parliament/bills.nsf/62D4F7C55EA88993482572110007316A/$File/Bill174-1.pdf> -# # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule AW 1974 only - Oct lastSun 2:00s 1:00 - Rule AW 1975 only - Mar Sun>=1 2:00s 0 - @@ -48,6 +43,10 @@ Rule AW 2007 2008 - Oct lastSun 2:00s 1:00 - Zone Australia/Perth 7:43:24 - LMT 1895 Dec 8:00 Aus WST 1943 Jul 8:00 AW WST +Zone Australia/Eucla 8:35:28 - LMT 1895 Dec + 8:45 Aus CWST 1943 Jul + 8:45 AW CWST + # Queensland # # From Alex Livingston (1996-11-01): @@ -203,16 +202,16 @@ Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb # # Ashmore Is, Cartier # no indigenous inhabitants; only seasonal caretakers -# like Australia/Perth, says Turner +# no times are set # # Coral Sea Is # no indigenous inhabitants; only meteorologists -# no information +# no times are set # # Macquarie # permanent occupation (scientific station) since 1948; # sealing and penguin oil station operated 1888/1917 -# like Australia/Hobart, says Turner +# like Australia/Hobart # Christmas # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -544,6 +543,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # std dst # LMT Local Mean Time # 8:00 WST WST Western Australia +# 8:45 CWST CWST Central Western Australia* # 9:00 JST Japan # 9:30 CST CST Central Australia # 10:00 EST EST Eastern Australia @@ -816,37 +816,51 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # From Arthur David Olson (1992-03-08): # The chosen rules the union of the 1971/1972 change and the 1989-1992 changes. +# From Christopher Hunt (2006-11-21), after an advance warning +# from Jesper Norgaard Welen (2006-11-01): +# WA are trialing DST for three years. +# <http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf> + # From Rives McDow (2002-04-09): # The most interesting region I have found consists of three towns on the -# southern coast of Australia, population 10 at last report, along with -# 50,000 sheep, about 100 kilometers long and 40 kilometers into the -# continent. The primary town is Madura, with the other towns being -# Mundrabilla and Eucla. According to the sheriff of Madura, the -# residents got tired of having to change the time so often, as they are -# located in a strip overlapping the border of South Australia and Western -# Australia. South Australia observes daylight saving time; Western +# southern coast.... South Australia observes daylight saving time; Western # Australia does not. The two states are one and a half hours apart. The # residents decided to forget about this nonsense of changing the clock so # much and set the local time 20 hours and 45 minutes from the # international date line, or right in the middle of the time of South -# Australia and Western Australia. As it only affects about 10 people and -# tourists staying at the Madura Motel, it has never really made as big an -# impact as Broken Hill. However, as tourist visiting there or anyone -# calling the local sheriff will attest, they do keep time in this way. +# Australia and Western Australia.... # # From Paul Eggert (2002-04-09): # This is confirmed by the section entitled # "What's the deal with time zones???" in -# <http://www.earthsci.unimelb.edu.au/~awatkins/null.html>, -# which says a few other things: -# -# * Border Village, SA also is 45 minutes ahead of Perth. -# * The locals call this time zone "central W.A. Time" (presumably "CWAT"). -# * The locals also call Western Australia time "Perth time". -# -# It's not clear from context whether everyone in Western Australia -# knows of this naming convention, or whether it's just the people in -# this subregion. +# <http://www.earthsci.unimelb.edu.au/~awatkins/null.html>. +# +# From Alex Livingston (2006-12-07): +# ... it was just on four years ago that I drove along the Eyre Highway, +# which passes through eastern Western Australia close to the southern +# coast of the continent. +# +# I paid particular attention to the time kept there. There can be no +# dispute that UTC+08:45 was considered "the time" from the border +# village just inside the border with South Australia to as far west +# as just east of Caiguna. There can also be no dispute that Eucla is +# the largest population centre in this zone.... +# +# Now that Western Australia is observing daylight saving, the +# question arose whether this part of the state would follow suit. I +# just called the border village and confirmed that indeed they have, +# meaning that they are now observing UTC+09:45. +# +# (2006-12-09): +# I personally doubt that either experimentation with daylight saving +# in WA or its introduction in SA had anything to do with the genesis +# of this time zone. My hunch is that it's been around since well +# before 1975. I remember seeing it noted on road maps decades ago. + +# From Paul Eggert (2006-12-15): +# For lack of better info, assume the tradition dates back to the +# introduction of standard time in 1895. + # South Australia, Tasmania, Victoria diff --git a/elsie.nci.nih.gov/src/backward b/elsie.nci.nih.gov/src/backward index 0082440..7c92260 100644 --- a/elsie.nci.nih.gov/src/backward +++ b/elsie.nci.nih.gov/src/backward @@ -1,8 +1,9 @@ -# @(#)backward 8.2 +# @(#)backward 8.3 # This file provides links between current names for time zones # and their old names. Many names changed in late 1993. +Link Africa/Asmara Africa/Asmera Link Africa/Bamako Africa/Timbuktu Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Adak America/Atka @@ -28,6 +29,7 @@ Link Asia/Jerusalem Asia/Tel_Aviv Link Asia/Thimphu Asia/Thimbu Link Asia/Makassar Asia/Ujung_Pandang Link Asia/Ulaanbaatar Asia/Ulan_Bator +Link Atlantic/Faroe Atlantic/Faeroe Link Australia/Sydney Australia/ACT Link Australia/Sydney Australia/Canberra Link Australia/Lord_Howe Australia/LHI diff --git a/elsie.nci.nih.gov/src/europe b/elsie.nci.nih.gov/src/europe index b3a3b26..de892fa 100644 --- a/elsie.nci.nih.gov/src/europe +++ b/elsie.nci.nih.gov/src/europe @@ -1,4 +1,4 @@ -# @(#)europe 8.6 +# @(#)europe 8.8 # <pre> # This data is by no means authoritative; if you think you know better, @@ -754,7 +754,7 @@ Zone Europe/Prague 0:57:44 - LMT 1850 1:00 Czech CE%sT 1979 1:00 EU CE%sT -# Denmark, Faeroe Islands, and Greenland +# Denmark, Faroe Islands, and Greenland # From Jesper Norgaard Welen (2005-04-26): # http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law @@ -809,7 +809,7 @@ Zone Europe/Copenhagen 0:50:20 - LMT 1890 1:00 C-Eur CE%sT 1945 Apr 2 2:00 1:00 Denmark CE%sT 1980 1:00 EU CE%sT -Zone Atlantic/Faeroe -0:27:04 - LMT 1908 Jan 11 # Torshavn +Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Torshavn 0:00 - WET 1981 0:00 EU WE%sT # @@ -2278,6 +2278,24 @@ Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 1:00 EU CE%sT # Turkey + +# From Amar Devegowda (2007-01-03): +# The time zone rules for Istanbul, Turkey have not been changed for years now. +# ... The latest rules are available at - +# http://www.timeanddate.com/worldclock/timezone.html?n=107 +# From Steffen Thorsen (2007-01-03): +# I have been able to find press records back to 1996 which all say that +# DST started 01:00 local time and end at 02:00 local time. I am not sure +# what happened before that. One example for each year from 1996 to 2001: +# http://newspot.byegm.gov.tr/arsiv/1996/21/N4.htm +# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING97/03/97X03X25.TXT +# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING98/03/98X03X02.HTM +# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING99/10/99X10X26.HTM#%2016 +# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2000/03/00X03X06.HTM#%2021 +# http://www.byegm.gov.tr/YAYINLARIMIZ/CHR/ING2001/03/23x03x01.HTM#%2027 +# From Paul Eggert (2007-01-03): +# Prefer the above source to Shanks & Pottenger for time stamps after 1990. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Turkey 1916 only - May 1 0:00 1:00 S Rule Turkey 1916 only - Oct 1 0:00 0 - @@ -2332,14 +2350,17 @@ Rule Turkey 1983 only - Jul 31 0:00 1:00 S Rule Turkey 1983 only - Oct 2 0:00 0 - Rule Turkey 1985 only - Apr 20 0:00 1:00 S Rule Turkey 1985 only - Sep 28 0:00 0 - +Rule Turkey 1986 1990 - Mar lastSun 2:00s 1:00 S +Rule Turkey 1986 1990 - Sep lastSun 2:00s 0 - +Rule Turkey 1991 max - Mar lastSun 1:00s 1:00 S +Rule Turkey 1991 1995 - Sep lastSun 1:00s 0 - +Rule Turkey 1996 max - Oct lastSun 1:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Istanbul 1:55:52 - LMT 1880 1:56:56 - IMT 1910 Oct # Istanbul Mean Time? 2:00 Turkey EE%sT 1978 Oct 15 3:00 Turkey TR%sT 1985 Apr 20 # Turkey Time - 2:00 Turkey EE%sT 1986 - 2:00 C-Eur EE%sT 1991 - 2:00 EU EE%sT + 2:00 Turkey EE%sT Link Europe/Istanbul Asia/Istanbul # Istanbul is in both continents. # Ukraine diff --git a/elsie.nci.nih.gov/src/iso3166.tab b/elsie.nci.nih.gov/src/iso3166.tab index 8bb8231..0e985e9 100644 --- a/elsie.nci.nih.gov/src/iso3166.tab +++ b/elsie.nci.nih.gov/src/iso3166.tab @@ -1,6 +1,6 @@ # ISO 3166 alpha-2 country codes # -# @(#)iso3166.tab 8.3 +# @(#)iso3166.tab 8.4 # # From Paul Eggert (2006-09-27): # @@ -92,7 +92,7 @@ FI Finland FJ Fiji FK Falkland Islands FM Micronesia -FO Faeroe Islands +FO Faroe Islands FR France GA Gabon GB Britain (UK) diff --git a/elsie.nci.nih.gov/src/leapseconds b/elsie.nci.nih.gov/src/leapseconds index d2b506b..2426866 100644 --- a/elsie.nci.nih.gov/src/leapseconds +++ b/elsie.nci.nih.gov/src/leapseconds @@ -1,4 +1,4 @@ -# @(#)leapseconds 8.1 +# @(#)leapseconds 8.2 # Allowance for leapseconds added to each timezone file. @@ -45,48 +45,38 @@ Leap 1997 Jun 30 23:59:60 + S Leap 1998 Dec 31 23:59:60 + S Leap 2005 Dec 31 23:59:60 + S -# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) -# +# ... +# Sent: Thursday, February 01, 2007 9:49 AM +# ... +# Subject: Bulletin C number 33 +# +# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS) +# # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE -# +# # SERVICE DE LA ROTATION TERRESTRE # OBSERVATOIRE DE PARIS # 61, Av. de l'Observatoire 75014 PARIS (France) -# Tel. : 33 (0) 1 40 51 22 26 -# FAX : 33 (0) 1 40 51 22 91 # ... -# http://hpiers.obspm.fr/eop-pc -# -# Paris, 4 July 2005 -# -# Bulletin C 30 -# -# To authorities responsible -# for the measurement and -# distribution of time -# -# -# UTC TIME STEP -# on the 1st of January 2006 -# -# A positive leap second will be introduced at the end of December 2005. -# The sequence of dates of the UTC second markers will be: -# -# 2005 December 31, 23h 59m 59s -# 2005 December 31, 23h 59m 60s -# 2006 January 1, 0h 0m 0s -# -# The difference between UTC and the International Atomic Time TAI is: -# -# from 1999 January 1, 0h UTC, to 2006 January 1 0h UTC : UTC-TAI = - 32s -# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = - 33s -# -# Leap seconds can be introduced in UtC at the end of the months of December -# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every -# six months, either to announce a time step in UTC or to confirm that there -# will be no time step at the next possible date. -# -# Daniel GAMBIS -# Head -# Earth Orientation Center of IERS -# Observatoire de Paris, France +# +# Paris, 1 February 2007 +# Bulletin C 33 +# To authorities responsible +# for the measurement and +# distribution of time +# +# INFORMATION ON UTC - TAI +# +# NO positive leap second will be introduced at the end of June 2007. +# The difference between Coordinated Universal Time UTC and the +# International Atomic Time TAI is: +# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s +# Leap seconds can be introduced in UTC at the end of the months of +# December or June, depending on the evolution of UT1-TAI. Bulletin C is +# mailed every six months, either to announce a time step in UTC, or to +# confirm that there will be no time step at the next possible date. +# +# Daniel GAMBIS +# Director +# Earth Orientation Center of IERS +# Observatoire de Paris, France diff --git a/elsie.nci.nih.gov/src/northamerica b/elsie.nci.nih.gov/src/northamerica index 3d80c5e..1b99113 100644 --- a/elsie.nci.nih.gov/src/northamerica +++ b/elsie.nci.nih.gov/src/northamerica @@ -1,4 +1,4 @@ -# @(#)northamerica 8.10 +# @(#)northamerica 8.12 # <pre> # also includes Central America and the Caribbean @@ -583,6 +583,11 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11 # clocks twice that night, but this obviously is in error. The intent # is that 01:59:59 EST be followed by 02:00:00 CDT. +# From Gwillim Law (2007-02-10): +# The Associated Press has been reporting that Pulaski County, Indiana is +# going to switch from Central to Eastern Time on March 11, 2007.... +# http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/702070524/0/LOCAL + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER Rule Indianapolis 1941 only - Jun 22 2:00 1:00 D Rule Indianapolis 1941 1954 - Sep lastSun 2:00 0 S @@ -618,7 +623,7 @@ Zone America/Indiana/Marengo -5:45:23 - LMT 1883 Nov 18 12:14:37 -5:00 - EST 2006 -5:00 US E%sT # -# Daviess, Dubois, Knox, Martin, Perry, and Pulaski Counties, Indiana, +# Daviess, Dubois, Knox, Martin, and Perry Counties, Indiana, # switched from eastern to central time in April 2006. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER Rule Vincennes 1946 only - Apr lastSun 2:00 1:00 D @@ -676,6 +681,23 @@ Zone America/Indiana/Knox -5:46:30 - LMT 1883 Nov 18 12:13:30 -5:00 - EST 2006 Apr 2 2:00 -6:00 US C%sT # +# Pulaski County, Indiana, switched from eastern to central time in +# April 2006 and then switched back in March 2007. +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER +Rule Pulaski 1946 1960 - Apr lastSun 2:00 1:00 D +Rule Pulaski 1946 1954 - Sep lastSun 2:00 0 S +Rule Pulaski 1955 1956 - Oct lastSun 2:00 0 S +Rule Pulaski 1957 1960 - Sep lastSun 2:00 0 S +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone America/Indiana/Winamac -5:46:25 - LMT 1883 Nov 18 12:13:35 + -6:00 US C%sT 1946 + -6:00 Pulaski C%sT 1961 Apr 30 2:00 + -5:00 - EST 1969 + -5:00 US E%sT 1971 + -5:00 - EST 2006 Apr 2 2:00 + -6:00 US C%sT 2007 Mar 11 2:00 + -5:00 US E%sT +# # Switzerland County, Indiana, did not observe DST from 1973 through 2005. # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44 @@ -894,18 +916,16 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00 # Unless otherwise specified, the data for Canada are all from Shanks # & Pottenger. -# From Chris Walton (2006-04-01): +# From Chris Walton (2006-04-01, 2006-04-25, 2006-06-26, 2007-01-31): # The British Columbia government announced yesterday that it will # adjust daylight savings next year to align with changes in the # U.S. and the rest of Canada.... # http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm - -# From Chris Walton (2006-04-25): +# ... +# Nova Scotia # Daylight saving time will be extended by four weeks starting in 2007.... -# Here is a news release which was issued today by the Nova Scotia government: -# http://www.gov.ns.ca/news/details.asp?id=20060425004 - -# From Chris Walton (2006-06-26): +# http://www.gov.ns.ca/just/regulations/rg2/2006/ma1206.pdf +# # [For New Brunswick] the new legislation dictates that the time change is to # be done at 02:00 instead of 00:01. # http://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf @@ -915,16 +935,18 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00 # http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php # ... # [Alberta, Ontario, Quebec] will follow US rules. -# http://www.qp.gov.ab.ca/documents/Acts/2006CH03_UNPR.cfm?frm_isbn=0779744934 +# http://www.qp.gov.ab.ca/documents/spring/CH03_06.CFM # http://www.e-laws.gov.on.ca/DBLaws/Source/Regs/English/2006/R06111_e.htm -# http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm +# http://www2.publicationsduquebec.gouv.qc.ca/dynamicSearch/telecharge.php?type=5&file=2006C39A.PDF # ... -# P.E.I. will follow US rules. The new legislation is not law yet. -# It passed first reading on April 20.... -# http://www.assembly.pe.ca/bills/pdf_first/62/3/bill-101.pdf +# P.E.I. will follow US rules.... +# http://www.assembly.pe.ca/bills/pdf_chapter/62/3/chapter-41.pdf # ... -# Province of Newfoundland and Labrador.... The change is being considered. -# http://www.releases.gov.nl.ca/releases/2006/mpa/0331n01.htm +# Province of Newfoundland and Labrador.... +# http://www.hoa.gov.nl.ca/hoa/bills/Bill0634.htm +# ... +# Yukon +# http://www.gov.yk.ca/legislation/regs/oic2006_127.pdf # ... # N.W.T. will follow US rules. Whoever maintains the government web site # does not seem to believe in bookmarks. To see the news release, click the @@ -932,7 +954,14 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00 # "Daylight Savings Time Change" link; it will fire off a popup using # JavaScript. # http://www.exec.gov.nt.ca/currentnews/currentPR.asp?mode=archive - +# ... +# No formal announcement has been made from the Nunavut Government. +# The premier of Nunavut claimed in August of 2005 that he did not +# want to touch the issue; nothing more has been heard since. It is +# likely Nunavut will eventually follow the rest of the country but +# there will certainly be confusion on March 11/2007 if no formal +# announcement is made. Currently the TZ database and Microsoft make +# assumptions that Nunavut will follow the rest of the country. # From Paul Eggert (2006-04-25): @@ -1100,11 +1129,11 @@ Zone America/Glace_Bay -3:59:48 - LMT 1902 Jun 15 # New Brunswick -# From Paul Eggert (2006-01-20): -# New Brunswick's Time Definition Act -# <http://www.gnb.ca/0062/PDF-acts/t-06.pdf> says they change at 00:01, and +# From Paul Eggert (2007-01-31): +# The Time Definition Act <http://www.gnb.ca/0062/PDF-acts/t-06.pdf> +# says they changed at 00:01 through 2006, and # <http://www.canlii.org/nb/laws/sta/t-6/20030127/whole.html> makes it -# clear that this has been the case since at least 1993. +# clear that this was the case since at least 1993. # For now, assume it started in 1993. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S @@ -1676,10 +1705,6 @@ Zone America/Dawson_Creek -8:00:56 - LMT 1884 # For lack of better information, assume that Southampton Island observed # daylight saving only during wartime. -# From Chris Walton (2006-07-19): -# The government of Yukon Territory ... recently announced it will extend -# daylight saving in 2007.... http://www.gov.yk.ca/news/2006/06-164.html - # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule NT_YK 1918 only - Apr 14 2:00 1:00 D Rule NT_YK 1918 only - Oct 27 2:00 0 S @@ -1997,13 +2022,19 @@ Zone America/Antigua -4:07:12 - LMT 1912 Mar 2 -4:00 - AST # Bahamas +# +# From Sue Williams (2006-12-07): +# The Bahamas announced about a month ago that they plan to change their DST +# rules to sync with the U.S. starting in 2007.... +# http://www.jonesbahamas.com/?c=45&a=10412 + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Bahamas 1964 max - Oct lastSun 2:00 0 S +Rule Bahamas 1964 2006 - Oct lastSun 2:00 0 S Rule Bahamas 1964 1986 - Apr lastSun 2:00 1:00 D -Rule Bahamas 1987 max - Apr Sun>=1 2:00 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Nassau -5:09:24 - LMT 1912 Mar 2 - -5:00 Bahamas E%sT + -5:00 Bahamas E%sT 1976 + -5:00 US E%sT # Barbados # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S diff --git a/elsie.nci.nih.gov/src/southamerica b/elsie.nci.nih.gov/src/southamerica index ca6c492..844a828 100644 --- a/elsie.nci.nih.gov/src/southamerica +++ b/elsie.nci.nih.gov/src/southamerica @@ -1,4 +1,4 @@ -# @(#)southamerica 8.6 +# @(#)southamerica 8.9 # <pre> # This data is by no means authoritative; if you think you know better, @@ -714,8 +714,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 # (they should have been 1990-09-15 and 1990-09-16 respectively), but # anyhow it clears up some doubts too. -# The following data are from <http://www.horaoficial.cl/horaof.htm> -# (2006-09-20), transcribed by Jesper Norgaard Welen. +# From Paul Eggert (2006-12-27): +# The following data for Chile and America/Santiago are from +# <http://www.horaoficial.cl/horaof.htm> (2006-09-20), transcribed by +# Jesper Norgaard Welen. The data for Pacific/Easter are from Shanks +# & Pottenger, except with DST transitions after 1932 cloned from +# America/Santiago. The pre-1980 Pacific/Easter data are dubious, +# but we have no other source. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Chile 1927 1932 - Sep 1 0:00 1:00 S @@ -759,9 +764,9 @@ Zone America/Santiago -4:42:46 - LMT 1890 -4:42:46 - SMT 1927 Sep 1 # Santiago Mean Time -5:00 Chile CL%sT 1947 May 22 # Chile Time -4:00 Chile CL%sT -Zone Pacific/Easter -7:17:28 - LMT 1890 # Mataveri - -7:17:28 - MMT 1932 Sep # Mataveri Mean Time - -7:00 Chile EAS%sT 1982 Jan 18 21:00 # Easter I Time +Zone Pacific/Easter -7:17:44 - LMT 1890 + -7:17:28 - EMT 1932 Sep # Easter Mean Time + -7:00 Chile EAS%sT 1982 Mar 13 21:00 # Easter I Time -6:00 Chile EAS%sT # # Sala y Gomez Island is like Pacific/Easter. diff --git a/elsie.nci.nih.gov/src/tz-link.htm b/elsie.nci.nih.gov/src/tz-link.htm index 0bb2b6a..c467df5 100644 --- a/elsie.nci.nih.gov/src/tz-link.htm +++ b/elsie.nci.nih.gov/src/tz-link.htm @@ -8,7 +8,7 @@ <meta http-equiv="Content-type" content='text/html; charset="US-ASCII"'> <meta name="DC.Creator" content="Eggert, Paul"> <meta name="DC.Contributor" content="Olson, Arthur David"> -<meta name="DC.Date" content="2006-11-22"> +<meta name="DC.Date" content="2007-02-22"> <meta name="DC.Description" content="Sources of information about time zones and daylight saving time"> <meta name="DC.Identifier" content="http://www.twinsun.com/tz/tz-link.htm"> @@ -18,7 +18,7 @@ <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> <address> -@(#)tz-link.htm 8.8 +@(#)tz-link.htm 8.10 </address> <p> Please send corrections to this web page to the @@ -152,6 +152,9 @@ Consortium</a> is promoting further work in this area. <a href="http://www.calconnect.org/publications/icalendartimezoneproblemsandrecommendationsv1.0.pdf">iCalendar TIMEZONE Problems and Recommendations</a> offers guidelines and recommendations for the use of VTIMEZONE and <code>tz</code>.</li> +<li><a href="http://www.calconnect.org/dstlinks.html">Extended Daylight +Saving Time Links, Advisories and Changes</a> lists vendor material on recent +daylight saving time changes.</li> <li><a href="http://www.calconnect.org/publications/timezoneregistryandservicerecommendationsv1.0.pdf">Timezone Registry and Service Recommendations</a> discusses a @@ -216,6 +219,13 @@ compiles <code>tz</code> source into <a href="http://www.ruby-lang.org/">Ruby</a>. It is freely available under the <abbr title="Massachusetts Institute of Technology">MIT</abbr> license.</li> +<li>The <a href="http://www.chronos-st.org/">Chronos Date/Time +Library</a> is a <a href="http://smalltalk.org/">Smalltalk</a> class +library that compiles <code>tz</code> source into a <a +href="http://date-time-zone.com/">time zone repository</a> whose format +is either proprietary or an <a href="http://www.w3.org/XML/"><abbr +title="Extensible Markup Language">XML</abbr></a>-encoded +representation.</li> <li>Starting with version 8.5, <a href="http://www.tcl.tk/">Tcl</a> contains a developer-oriented parser that compiles <samp>tz</samp> source into text files, along with a runtime that can read those @@ -379,7 +389,10 @@ Zone Concepts</a> discusses terminological issues behind time zones.</li> <h2>National histories of legal time</h2> <dl> <dt>Australia</dt> -<dd>The Bureau of Metrology publishes a list of +<dd>The Parliamentary Library has commissioned <a +href="http://www.aph.gov.au/LIBRARY/Pubs/rn/2006-07/07rn13.pdf">research +note on daylight saving time in Australia</a>. +The Bureau of Metrology publishes a list of <a href="http://www.bom.gov.au/climate/averages/tables/dst_times.shtml">Implementation Dates of Daylight Savings Time within Australia</a>.</dd> <dt>Austria</dt> <dd>The Federal Office of Metrology and Surveying publishes a @@ -540,11 +553,9 @@ title="International Organization for Standardization">ISO</abbr> 8601:2004 -- Data elements and interchange formats -- Information interchange -- Representation of dates and times</a>.</li> <li> -<a href="http://www.w3.org/TR/xmlschema-2/#dateTime"><abbr -title="Extensible Markup Language">XML</abbr> +<a href="http://www.w3.org/TR/xmlschema-2/#dateTime"><abbr>XML</abbr> Schema: Datatypes - dateTime</a> specifies a format inspired by -<abbr>ISO</abbr> 8601 that is in common use in <a -href="http://www.w3.org/XML/"><abbr>XML</abbr></a> data.</li> +<abbr>ISO</abbr> 8601 that is in common use in XML data.</li> <li> <a href="ftp://ftp.rfc-editor.org/in-notes/rfc2822.txt">Internet <abbr title="Request For Comments">RFC</abbr> 2822</a> §3.3 diff --git a/elsie.nci.nih.gov/src/zdump.c b/elsie.nci.nih.gov/src/zdump.c index b5dd09b..d6ababd 100644 --- a/elsie.nci.nih.gov/src/zdump.c +++ b/elsie.nci.nih.gov/src/zdump.c @@ -1,4 +1,4 @@ -static char elsieid[] = "@(#)zdump.c 8.2"; +static char elsieid[] = "@(#)zdump.c 8.3"; /* ** This code has been made independent of the rest of the time @@ -385,7 +385,7 @@ _("%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"), } if (fflush(stdout) || ferror(stdout)) { (void) fprintf(stderr, "%s: ", progname); - (void) perror(_("Error writing standard output")); + (void) perror(_("Error writing to standard output")); exit(EXIT_FAILURE); } exit(EXIT_SUCCESS); diff --git a/elsie.nci.nih.gov/src/zic.8 b/elsie.nci.nih.gov/src/zic.8 index be44692..0cba815 100644 --- a/elsie.nci.nih.gov/src/zic.8 +++ b/elsie.nci.nih.gov/src/zic.8 @@ -411,6 +411,63 @@ or .q Rolling if the leap second time given by the other fields should be interpreted as local wall clock time. +.SH "EXTENDED EXAMPLE" +Here is an extended example of +.I zic +input, intended to illustrate many of its features. +.br +.ne 22 +.nf +.in +2m +.ta \w'# Rule\0\0'u +\w'NAME\0\0'u +\w'FROM\0\0'u +\w'1973\0\0'u +\w'TYPE\0\0'u +\w'Apr\0\0'u +\w'lastSun\0\0'u +\w'2:00\0\0'u +\w'SAVE\0\0'u +.sp +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +Rule Swiss 1940 only - Nov 2 0:00 1:00 S +Rule Swiss 1940 only - Dec 31 0:00 0 - +Rule Swiss 1941 1942 - May Sun>=1 2:00 1:00 S +Rule Swiss 1941 1942 - Oct Sun>=1 0:00 0 +.sp .5 +Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S +Rule EU 1977 only - Sep lastSun 1:00u 0 - +Rule EU 1978 only - Oct 1 1:00u 0 - +Rule EU 1979 1995 - Sep lastSun 1:00u 0 - +Rule EU 1981 max - Mar lastSun 1:00u 1:00 S +Rule EU 1996 max - Oct lastSun 1:00u 0 - +.sp +.ta \w'# Zone\0\0'u +\w'Europe/Zurich\0\0'u +\w'0:34:08\0\0'u +\w'RULES/SAVE\0\0'u +\w'FORMAT\0\0'u +# Zone NAME GMTOFF RULES FORMAT UNTIL +Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 + 0:29:44 - BMT 1894 Jun + 1:00 Swiss CE%sT 1981 + 1:00 EU CE%sT +.sp +Link Europe/Zurich Switzerland +.sp +.in +.fi +In this example, the zone is named Europe/Zurich but it has an alias +as Switzerland. Zurich was 34 minutes and 8 seconds west of GMT until +1848-09-12 at 00:00, when the offset changed to 29 minutes and 44 +seconds. After 1894-06-01 at 00:00 Swiss daylight saving rules (defined +with lines beginning with "Rule Swiss") apply, and the GMT offset +became one hour. From 1981 to the present, EU daylight saving rules have +applied, and the UTC offset has remained at one hour. +.PP +In 1940, daylight saving time applied from November 2 at 00:00 to +December 31 at 00:00. In 1941 and 1942, daylight saving time applied +from the first Sunday in May at 02:00 to the first Sunday in October +at 00:00. +The pre-1981 EU daylight-saving rules have no effect +here, but are included for completeness. Since 1981, daylight +saving has begun on the last Sunday in March at 01:00 UTC. +Until 1995 it ended the last Sunday in September at 01:00 UTC, +but this changed to the last Sunday in October starting in 1996. +.PP +For purposes of +display, "LMT" and "BMT" were initially used, respectively. Since +Swiss rules and later EU rules were applied, the display name for the +timezone has been CET for standard time and CEST for daylight saving +time. .SH NOTES For areas with more than two types of local time, you may need to use local standard time in the @@ -433,4 +490,4 @@ specifying transition instants using universal time. /usr/local/etc/zoneinfo standard directory used for created files .SH "SEE ALSO" newctime(3), tzfile(5), zdump(8) -.\" @(#)zic.8 8.2 +.\" @(#)zic.8 8.3 diff --git a/elsie.nci.nih.gov/src/zic.8.txt b/elsie.nci.nih.gov/src/zic.8.txt index b319559..0b3b6fb 100644 --- a/elsie.nci.nih.gov/src/zic.8.txt +++ b/elsie.nci.nih.gov/src/zic.8.txt @@ -238,6 +238,55 @@ DESCRIPTION time given by the other fields should be interpreted as local wall clock time. +EXTENDED EXAMPLE + Here is an extended example of zic input, intended to + illustrate many of its features. + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Swiss 1940 only - Nov 2 0:00 1:00 S + Rule Swiss 1940 only - Dec 31 0:00 0 - + Rule Swiss 1941 1942 - May Sun>=1 2:00 1:00 S + Rule Swiss 1941 1942 - Oct Sun>=1 0:00 0 +9 Rule EU 1977 1980 - Apr Sun>=1 1:00u 1:00 S + Rule EU 1977 only - Sep lastSun 1:00u 0 - + Rule EU 1978 only - Oct 1 1:00u 0 - + Rule EU 1979 1995 - Sep lastSun 1:00u 0 - + Rule EU 1981 max - Mar lastSun 1:00u 1:00 S + Rule EU 1996 max - Oct lastSun 1:00u 0 - + + # Zone NAME GMTOFF RULES FORMAT UNTIL + Zone Europe/Zurich 0:34:08 - LMT 1848 Sep 12 + 0:29:44 - BMT 1894 Jun + 1:00 Swiss CE%sT 1981 + 1:00 EU CE%sT + + Link Europe/Zurich Switzerland + + In this example, the zone is named Europe/Zurich but it has + an alias as Switzerland. Zurich was 34 minutes and 8 + seconds west of GMT until 1848-09-12 at 00:00, when the + offset changed to 29 minutes and 44 seconds. After + 1894-06-01 at 00:00 Swiss daylight saving rules (defined + with lines beginning with "Rule Swiss") apply, and the GMT + offset became one hour. From 1981 to the present, EU + daylight saving rules have applied, and the UTC offset has + remained at one hour. + + In 1940, daylight saving time applied from November 2 at + 00:00 to December 31 at 00:00. In 1941 and 1942, daylight + saving time applied from the first Sunday in May at 02:00 to + the first Sunday in October at 00:00. The pre-1981 EU + daylight-saving rules have no effect here, but are included + for completeness. Since 1981, daylight saving has begun on + the last Sunday in March at 01:00 UTC. Until 1995 it ended + the last Sunday in September at 01:00 UTC, but this changed + to the last Sunday in October starting in 1996. + + For purposes of display, "LMT" and "BMT" were initially + used, respectively. Since Swiss rules and later EU rules + were applied, the display name for the timezone has been CET + for standard time and CEST for daylight saving time. + NOTES For areas with more than two types of local time, you may need to use local standard time in the AT field of the @@ -253,8 +302,8 @@ NOTES transition instants using universal time. FILE - /usr/local/etc/zoneinfo standard directory used for created - files + /usr/local/etc/zoneinfo standard directory used for + created files SEE ALSO newctime(3), tzfile(5), zdump(8) diff --git a/elsie.nci.nih.gov/src/zic.c b/elsie.nci.nih.gov/src/zic.c index 8406c24..55904b9 100644 --- a/elsie.nci.nih.gov/src/zic.c +++ b/elsie.nci.nih.gov/src/zic.c @@ -3,7 +3,7 @@ ** 2006-07-17 by Arthur David Olson. */ -static char elsieid[] = "@(#)zic.c 8.7"; +static char elsieid[] = "@(#)zic.c 8.10"; #include "private.h" #include "locale.h" @@ -675,7 +675,7 @@ const char * const tofile; "../"); symlinkcontents = ecatalloc(symlinkcontents, - fromfile); + fromname); result = symlink(symlinkcontents, toname); if (result == 0) @@ -2451,9 +2451,12 @@ register char * cp; else while ((*dp = *cp++) != '"') if (*dp != '\0') ++dp; - else error(_( + else { + error(_( "Odd number of quotation marks" )); + exit(1); + } } while (*cp != '\0' && *cp != '#' && (!isascii(*cp) || !isspace((unsigned char) *cp))); if (isascii(*cp) && isspace((unsigned char) *cp)) @@ -2641,7 +2644,7 @@ wp = _("time zone abbreviation differs from POSIX standard"); static int mkdirs(argname) -char * const argname; +char * argname; { register char * name; register char * cp; diff --git a/elsie.nci.nih.gov/src/zone.tab b/elsie.nci.nih.gov/src/zone.tab index 253e940..809d621 100644 --- a/elsie.nci.nih.gov/src/zone.tab +++ b/elsie.nci.nih.gov/src/zone.tab @@ -1,4 +1,4 @@ -# @(#)zone.tab 8.6 +# @(#)zone.tab 8.9 # # TZ zone descriptions # @@ -63,7 +63,8 @@ AU -2728+15302 Australia/Brisbane Queensland - most locations AU -2016+14900 Australia/Lindeman Queensland - Holiday Islands AU -3455+13835 Australia/Adelaide South Australia AU -1228+13050 Australia/Darwin Northern Territory -AU -3157+11551 Australia/Perth Western Australia +AU -3157+11551 Australia/Perth Western Australia - most locations +AU -3143+12852 Australia/Eucla Western Australia - Eucla area AW +1230-06858 America/Aruba AX +6006+01957 Europe/Mariehamn AZ +4023+04951 Asia/Baku @@ -134,7 +135,7 @@ CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga CL -3327-07040 America/Santiago most locations -CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez +CL -2709-10926 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 (except Mohe), Jilin @@ -159,7 +160,7 @@ EC -0054-08936 Pacific/Galapagos Galapagos Islands EE +5925+02445 Europe/Tallinn EG +3003+03115 Africa/Cairo EH +2709-01312 Africa/El_Aaiun -ER +1520+03853 Africa/Asmera +ER +1520+03853 Africa/Asmara ES +4024-00341 Europe/Madrid mainland ES +3553-00519 Africa/Ceuta Ceuta & Melilla ES +2806-01524 Atlantic/Canary Canary Islands @@ -170,7 +171,7 @@ FK -5142-05751 Atlantic/Stanley FM +0725+15147 Pacific/Truk Truk (Chuuk) and Yap FM +0658+15813 Pacific/Ponape Ponape (Pohnpei) FM +0519+16259 Pacific/Kosrae Kosrae -FO +6201-00646 Atlantic/Faeroe +FO +6201-00646 Atlantic/Faroe FR +4852+00220 Europe/Paris GA +0023+00927 Africa/Libreville GB +512830-0001845 Europe/London @@ -378,11 +379,12 @@ US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County US +394606-0860929 America/Indiana/Indianapolis Eastern Time - Indiana - most locations -US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County US +411745-0863730 America/Indiana/Knox Eastern Time - Indiana - Starke County +US +410305-0863611 America/Indiana/Winamac Eastern Time - Indiana - Pulaski County +US +382232-0862041 America/Indiana/Marengo Eastern Time - Indiana - Crawford County US +384452-0850402 America/Indiana/Vevay Eastern Time - Indiana - Switzerland County US +415100-0873900 America/Chicago Central Time -US +384038-0873143 America/Indiana/Vincennes Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski Counties +US +384038-0873143 America/Indiana/Vincennes Central Time - Indiana - Daviess, Dubois, Knox, Martin & Perry Counties US +382931-0871643 America/Indiana/Petersburg Central Time - Indiana - Pike County US +450628-0873651 America/Menominee Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py index e810a72..18f5e04 100644 --- a/src/pytz/__init__.py +++ b/src/pytz/__init__.py @@ -9,7 +9,7 @@ on how to use these modules. ''' # The Olson database has historically been updated about 4 times a year -OLSON_VERSION = '2006p' +OLSON_VERSION = '2007c' VERSION = OLSON_VERSION #VERSION = OLSON_VERSION + '.2' __version__ = OLSON_VERSION diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py index 9afebf4..d5e9252 100644 --- a/src/pytz/tests/test_tzinfo.py +++ b/src/pytz/tests/test_tzinfo.py @@ -13,7 +13,7 @@ if __name__ == '__main__': import pytz from pytz import reference -EXPECTED_VERSION='2006p' +EXPECTED_VERSION='2007c' fmt = '%Y-%m-%d %H:%M:%S %Z%z' |