[Checkins] SVN: DateTime/trunk/ Applying a patch from Marius Gedminus fixing the apparent pytz API breakage.

[Tres Seaver]

Log message for revision 112061:
  Applying a patch from Marius Gedminus fixing the apparent pytz API breakage.
  
  This fix allwos us to remove pin on pytz.
  
  Fixes Launchpad #572715: 
  

Changed:
  U   DateTime/trunk/CHANGES.txt
  U   DateTime/trunk/setup.py
  U   DateTime/trunk/src/DateTime/pytz_support.py

-=-
Modified: DateTime/trunk/CHANGES.txt
===================================================================
--- DateTime/trunk/CHANGES.txt	2010-05-05 19:42:27 UTC (rev 112060)
+++ DateTime/trunk/CHANGES.txt	2010-05-05 19:52:50 UTC (rev 112061)
@@ -4,6 +4,8 @@
 2.12.2 (unreleased)
 -------------------
 
+- Launchpad #572715:  Relaxed pin on pytz, after applying a patch from 
+  Marius Gedminus which fixes the apparent API breakage.
 
 2.12.1 (2010-04-30)
 -------------------

Modified: DateTime/trunk/setup.py
===================================================================
--- DateTime/trunk/setup.py	2010-05-05 19:42:27 UTC (rev 112060)
+++ DateTime/trunk/setup.py	2010-05-05 19:52:50 UTC (rev 112061)
@@ -32,7 +32,7 @@
       package_dir={'': 'src'},
 
       install_requires=['zope.interface',
-                        'pytz <= 2010b',
+                        'pytz',
                        ],
       include_package_data=True,
       test_suite='DateTime.tests.testDateTime.test_suite',

Modified: DateTime/trunk/src/DateTime/pytz_support.py
===================================================================
--- DateTime/trunk/src/DateTime/pytz_support.py	2010-05-05 19:42:27 UTC (rev 112060)
+++ DateTime/trunk/src/DateTime/pytz_support.py	2010-05-05 19:52:50 UTC (rev 112061)
@@ -221,14 +221,14 @@
         normalized_dt = self.tzinfo.normalize(dt.astimezone(self.tzinfo))
         normalized_tzinfo = normalized_dt.tzinfo
         
-        offset = normalized_tzinfo.utcoffset(dt)
+        offset = normalized_tzinfo.utcoffset(normalized_dt)
         secs = offset.days * 24 * 60 * 60 + offset.seconds
-        dst = normalized_tzinfo.dst(dt)
+        dst = normalized_tzinfo.dst(normalized_dt)
         if dst == timedelta(0):
             is_dst = 0
         else:
             is_dst = 1
-        return secs, is_dst, normalized_tzinfo.tzname(dt)
+        return secs, is_dst, normalized_tzinfo.tzname(normalized_dt)
 
 
 class PytzCache:
@@ -249,4 +249,4 @@
             try:
                 return Timezone(_numeric_timezones[name])
             except KeyError:
-                raise DateTimeError,'Unrecognized timezone: %s' % key
\ No newline at end of file
+                raise DateTimeError,'Unrecognized timezone: %s' % key