summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Bishop <stuart@stuartbishop.net>2009-06-17 10:36:04 +0700
committerStuart Bishop <stuart@stuartbishop.net>2009-06-17 10:36:04 +0700
commit4763dd36992adefe39d879b72b99a27f6d9b1307 (patch)
tree9465be6c8fc5927f126baca2bd39b88b18e1e053
parenta080418fd77a63d740d20b79befbbb9e1ab17539 (diff)
parenta8418080e4a2946845fe576ac419582c872e2857 (diff)
downloadpytz-4763dd36992adefe39d879b72b99a27f6d9b1307.tar.gz
Merge lp:~mnordhoff/pytz/2009i
-rw-r--r--elsie.nci.nih.gov/src/asia47
-rw-r--r--elsie.nci.nih.gov/src/tz-link.htm7
-rw-r--r--src/pytz/__init__.py2
-rw-r--r--src/pytz/tests/test_tzinfo.py2
4 files changed, 50 insertions, 8 deletions
diff --git a/elsie.nci.nih.gov/src/asia b/elsie.nci.nih.gov/src/asia
index 2ffc0c4..de2ca39 100644
--- a/elsie.nci.nih.gov/src/asia
+++ b/elsie.nci.nih.gov/src/asia
@@ -1,5 +1,5 @@
# <pre>
-# @(#)asia 8.32
+# @(#)asia 8.34
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -127,6 +127,48 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 # Al Manamah
3:00 - AST
# Bangladesh
+# From Alexander Krivenyshev (2009-05-13):
+# According to newspaper Asian Tribune (May 6, 2009) Bangladesh may introduce
+# Daylight Saving Time from June 16 to Sept 30
+#
+# Bangladesh to introduce daylight saving time likely from June 16
+# <a href="http://www.asiantribune.com/?q=node/17288">
+# http://www.asiantribune.com/?q=node/17288
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html">
+# http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html
+# </a>
+#
+# "... Bangladesh government has decided to switch daylight saving time from
+# June
+# 16 till September 30 in a bid to ensure maximum use of daylight to cope with
+# crippling power crisis. "
+#
+# The switch will remain in effect from June 16 to Sept 30 (2009) but if
+# implemented the next year, it will come in force from April 1, 2010
+
+# From Steffen Thorsen (2009-06-02):
+# They have finally decided now, but changed the start date to midnight between
+# the 19th and 20th, and they have not set the end date yet.
+#
+# Some sources:
+# <a href="http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601">
+# http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
+# </a>
+# <a href="http://bdnews24.com/details.php?id=85889&cid=2">
+# http://bdnews24.com/details.php?id=85889&cid=2
+# </a>
+#
+# Our wrap-up:
+# <a href="http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html">
+# http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
+# </a>
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+Rule Bang 2009 only - Jan 1 0:00 0 -
+Rule Bang 2009 only - Jun 20 0:00 1:00 S
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Dhaka 6:01:40 - LMT 1890
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
@@ -134,7 +176,8 @@ Zone Asia/Dhaka 6:01:40 - LMT 1890
5:30 - IST 1942 Sep
6:30 - BURT 1951 Sep 30
6:00 - DACT 1971 Mar 26 # Dacca Time
- 6:00 - BDT # Bangladesh Time
+ 6:00 - BDT 2009 # Bangladesh Time
+ 6:00 Bang BD%sT
# Bhutan
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
diff --git a/elsie.nci.nih.gov/src/tz-link.htm b/elsie.nci.nih.gov/src/tz-link.htm
index 2c8ff2c..a584b1f 100644
--- a/elsie.nci.nih.gov/src/tz-link.htm
+++ b/elsie.nci.nih.gov/src/tz-link.htm
@@ -18,7 +18,7 @@
<body>
<h1>Sources for Time Zone and Daylight Saving Time Data</h1>
<address>
-@(#)tz-link.htm 8.19
+@(#)tz-link.htm 8.21
</address>
<p>
This file is in the public domain, so clarified as of
@@ -360,10 +360,9 @@ but the maps are more up to date.</li>
</ul>
<h2>Time zone boundaries</h2>
<ul>
-<li><a href="http://efele.net/maps/tz/us/">A map of the TZ timezones in
-the US</a> contains a <a
+<li><a href="http://efele.net/maps/tz/">TZ timezone maps</a> contains a <a
href="http://en.wikipedia.org/wiki/Shapefile">shapefile</a> of the
-<code>tz</code> regions in the US.</li>
+<code>tz</code> regions in the world.</li>
<li><a href="http://statoids.com/statoids.html">Administrative Divisions
of Countries ("Statoids")</a> contains detailed lists of
<code>tz</code>-related zone subdivision data.</li>
diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py
index 2d40c3d..30722d9 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 = '2009h'
+OLSON_VERSION = '2009i'
VERSION = OLSON_VERSION
# Version format for a patch release - only one so far.
#VERSION = OLSON_VERSION + '.2'
diff --git a/src/pytz/tests/test_tzinfo.py b/src/pytz/tests/test_tzinfo.py
index 3e695e9..eaf2a5b 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='2009h'
+EXPECTED_VERSION='2009i'
fmt = '%Y-%m-%d %H:%M:%S %Z%z'