[Zope3-checkins] CVS: Zope3/lib/python/datetime - _datetime.py:1.12

Tim Peters tim.one@comcast.net
Sat, 21 Dec 2002 12:21:15 -0500


Update of /cvs-repository/Zope3/lib/python/datetime
In directory cvs.zope.org:/tmp/cvs-serv14759/lib/python/datetime

Modified Files:
	_datetime.py 
Log Message:
Caught another place where utcoffset() result wasn't checked for sanity.


=== Zope3/lib/python/datetime/_datetime.py 1.11 => 1.12 ===
--- Zope3/lib/python/datetime/_datetime.py:1.11	Sat Dec 21 12:16:35 2002
+++ Zope3/lib/python/datetime/_datetime.py	Sat Dec 21 12:21:15 2002
@@ -1002,11 +1002,8 @@
             ottz = other.__tzinfo
         if mytz is ottz:
             return supercmp(other)
-        myoff = otoff = None
-        if mytz is not None:
-            myoff = mytz.utcoffset(self)
-        if ottz is not None:
-            otoff = ottz.utcoffset(other)
+        myoff = self.utcoffset()
+        otoff = other.utcoffset()
         if myoff == otoff:
             return supercmp(other)
         if myoff is None or otoff is None: