diff options
author | Stuart Bishop <stuart@stuartbishop.net> | 2008-10-08 16:41:04 +0700 |
---|---|---|
committer | Stuart Bishop <stuart@stuartbishop.net> | 2008-10-08 16:41:04 +0700 |
commit | 16bda9be888fd4ee800b722e562852a5ae688644 (patch) | |
tree | 7361376ef90e115f96965231750485341536af90 | |
parent | e2ec26181a592d0bf7127e8111ff9d18277f73b8 (diff) | |
download | pytz-16bda9be888fd4ee800b722e562852a5ae688644.tar.gz |
Upgrade to 2008g
-rw-r--r-- | elsie.nci.nih.gov/src/southamerica | 33 | ||||
-rw-r--r-- | elsie.nci.nih.gov/src/tz-art.htm | 12 | ||||
-rw-r--r-- | src/pytz/__init__.py | 3 | ||||
-rw-r--r-- | src/pytz/tests/test_tzinfo.py | 2 |
4 files changed, 36 insertions, 14 deletions
diff --git a/elsie.nci.nih.gov/src/southamerica b/elsie.nci.nih.gov/src/southamerica index e2244cf..989c568 100644 --- a/elsie.nci.nih.gov/src/southamerica +++ b/elsie.nci.nih.gov/src/southamerica @@ -1,4 +1,4 @@ -# @(#)southamerica 8.27 +# @(#)southamerica 8.29 # <pre> # This data is by no means authoritative; if you think you know better, @@ -619,7 +619,7 @@ Zone America/La_Paz -4:32:36 - LMT 1890 # </a> # Note that this link does not always work directly, but must be accessed # by going to -# <a href="http://www.mme.gov.br/first>" +# <a href="http://www.mme.gov.br/first"> # http://www.mme.gov.br/first # </a> # @@ -768,12 +768,33 @@ Rule Brazil 2007 only - Feb 25 0:00 0 - # Decree <a href="http://pcdsh01.on.br/DecHV6212.gif">6,212</a> (2007-09-26), # adopted by the same states as before. Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S -Rule Brazil 2008 max - Feb Sun>=15 0:00 0 - -Rule Brazil 2008 max - Oct Sun>=15 0:00 1:00 S +# From Frederico A. C. Neves (2008-09-10): +# Acording to this decree +# <a href="http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm"> +# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm +# </a> +# [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the +# 3rd Feb Sunday. There is an exception on the return date when this is +# the Carnival Sunday then the return date will be the next Sunday... +Rule Brazil 2008 max - Oct Sun>=15 0:00 1:00 S +Rule Brazil 2008 2011 - Feb Sun>=15 0:00 0 - +Rule Brazil 2012 only - Feb Sun>=22 0:00 0 - +Rule Brazil 2013 2014 - Feb Sun>=15 0:00 0 - +Rule Brazil 2015 only - Feb Sun>=22 0:00 0 - +Rule Brazil 2016 2022 - Feb Sun>=15 0:00 0 - +Rule Brazil 2023 only - Feb Sun>=22 0:00 0 - +Rule Brazil 2024 2025 - Feb Sun>=15 0:00 0 - +Rule Brazil 2026 only - Feb Sun>=22 0:00 0 - +Rule Brazil 2027 2033 - Feb Sun>=15 0:00 0 - +Rule Brazil 2034 only - Feb Sun>=22 0:00 0 - +Rule Brazil 2035 2036 - Feb Sun>=15 0:00 0 - +Rule Brazil 2037 only - Feb Sun>=22 0:00 0 - +# From Arthur David Olson (2008-09-29): +# The next is wrong in some years but is better than nothing. +Rule Brazil 2038 max - Feb Sun>=15 0:00 0 - + # The latest ruleset listed above says that the following states observe DST: # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP. -# For dates after mid-2008, the above rules with TO="max" are guesses -# and are quite possibly wrong, but are more likely than no DST at all. # Zone NAME GMTOFF RULES FORMAT [UNTIL] # diff --git a/elsie.nci.nih.gov/src/tz-art.htm b/elsie.nci.nih.gov/src/tz-art.htm index 0b6cc4e..ba5225a 100644 --- a/elsie.nci.nih.gov/src/tz-art.htm +++ b/elsie.nci.nih.gov/src/tz-art.htm @@ -9,7 +9,7 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN" <body> <h1>Time and the Arts</h1> <address> -@(#)tz-art.htm 8.9 +@(#)tz-art.htm 8.10 </address> <p> Please send corrections to this web page to the @@ -320,6 +320,11 @@ zones?" was a $32,000 question on the 2001-05-23 United States airing of "Who Wants to Be a Millionaire?" At this rate, the million-dollar time-zone question should have been asked 2002-06-04. </li> +<li> +A private jet's mid-flight change of time zones distorts Alison Dubois' +premonition in the "We Had a Dream" episode of "Medium" +(originally aired 2007-02-28). +</li> </ul> <hr> <ul> @@ -364,11 +369,6 @@ or are you trying to dazzle me with your command of time zones?" (Kelsey Grammer as "Frasier Crane") </li> <li> -A private jet's mid-flight change of time zones distorts Alison Dubois' -premonition in the "We Had a Dream" episode of "Medium" -(originally aired 2007-02-28). -</li> -<li> "Don't worry about the world coming to an end today. It is already tomorrow in Australia." (Charles M. Schulz, provided by Steve Summit) diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py index c33a50e..9b72ac3 100644 --- a/src/pytz/__init__.py +++ b/src/pytz/__init__.py @@ -9,8 +9,9 @@ on how to use these modules. ''' # The Olson database has historically been updated about 4 times a year -OLSON_VERSION = '2008f' +OLSON_VERSION = '2008g' VERSION = OLSON_VERSION +# Version format for a patch release - only one so far. #VERSION = OLSON_VERSION + '.2' __version__ = OLSON_VERSION diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py index 4726909..759ea84 100644 --- a/src/pytz/tests/test_tzinfo.py +++ b/src/pytz/tests/test_tzinfo.py @@ -15,7 +15,7 @@ from pytz import reference # I test for expected version to ensure the correct version of pytz is # actually being tested. -EXPECTED_VERSION='2008f' +EXPECTED_VERSION='2008g' fmt = '%Y-%m-%d %H:%M:%S %Z%z' |