Merge lp:~ahasenack/ubuntu/precise/python-tz/day-leap-fix-885163 into lp:ubuntu/precise/python-tz

[Andreas Hasenack]

This branch has the patch from bug #885163, done by Forest Bond. I tested it in oneiric and lucid and I intend to do an SRU release for those plus natty and maverick. The first step is to get this into precise.

My testcase was Landscape, which had a few broken pages due to this bug. With the patched package installed, Landscape worked again (tested on lucid and oneiric).

[Andreas Hasenack (ahasenack)]

This other test case, taken from a bug comment, can also be used:

#!/usr/bin/python
import pytz
from datetime import datetime
tz = pytz.timezone("Pacific/Apia")
d2 = datetime(2012,1,1)
local = tz.localize(d2)
local.dst()
print "All is good, NOT hit by bug #885163!"

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-08 15:47:51 +0000
+++ debian/changelog	2012-01-03 19:50:45 +0000
@@ -1,3 +1,10 @@
+python-tz (2011k-0ubuntu3) precise; urgency=low
+
+  [ Forest Bond ]
+  * Add patch samoa-idl (LP: #885163).
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 03 Jan 2012 17:37:59 -0200
+
 python-tz (2011k-0ubuntu2) precise; urgency=low
 
   * debian/patches/tzdata: Restore patch to use tzdata package for

=== added file 'debian/patches/samoa-idl'
--- debian/patches/samoa-idl	1970-01-01 00:00:00 +0000
+++ debian/patches/samoa-idl	2012-01-03 19:50:45 +0000
@@ -0,0 +1,44 @@
+=== modified file 'pytz/pytz/tests/test_tzinfo.py'
+--- pytz.orig/pytz/tests/test_tzinfo.py	2011-11-04 09:32:28 +0000
++++ pytz/pytz/tests/test_tzinfo.py	2011-11-04 09:59:20 +0000
+@@ -533,6 +533,24 @@
+         }
+ 
+ 
++class SamoaInternationalDateLineChange(USEasternDSTStartTestCase):
++    # At the end of 2011, Samoa will switch from being east of the
++    # international dateline to the west. There will be no Dec 30th
++    # 2011 and it will switch from UTC-11 to UTC+13.
++    tzinfo = pytz.timezone('Pacific/Apia')
++    transition_time = datetime(2011, 12, 30, 10, 0, 0, tzinfo=UTC)
++    before = {
++        'tzname': 'WSDT',
++        'utcoffset': timedelta(hours=-10),
++        'dst': timedelta(hours=1),
++        }
++    after = {
++        'tzname': 'WSDT',
++        'utcoffset': timedelta(hours=14),
++        'dst': timedelta(hours=1),
++        }
++
++
+ class ReferenceUSEasternDSTStartTestCase(USEasternDSTStartTestCase):
+     tzinfo = reference.Eastern
+     def test_arithmetic(self):
+
+=== modified file 'src/pytz/tzfile.py'
+--- src/pytz/tzfile.py	2011-02-08 10:18:52 +0000
++++ src/pytz/tzfile.py	2011-11-04 10:32:42 +0000
+@@ -97,7 +97,9 @@
+                         break
+                 dst = inf[0] - prev_inf[0] # dst offset
+ 
+-                if dst <= 0: # Bad dst? Look further.
++                # Bad dst? Look further. DST > 24 hours happens when
++                # a timzone has moved across the international dateline.
++                if dst <= 0 or dst > 3600*3:
+                     for j in range(i+1, len(transitions)):
+                         stdinf = ttinfo[lindexes[j]]
+                         if not stdinf[1]:
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-11-08 15:47:51 +0000
+++ debian/patches/series	2012-01-03 19:50:45 +0000
@@ -1,2 +1,3 @@
 tzdata
+samoa-idl
 debian-changes-2011k-0ubuntu2