[Zope3-checkins] CVS: Zope3/src/zope/app - datetimeutils.py:1.4

Tim Peters tim.one@comcast.net
Wed, 8 Jan 2003 15:18:59 -0500


Update of /cvs-repository/Zope3/src/zope/app
In directory cvs.zope.org:/tmp/cvs-serv7272/src/zope/app

Modified Files:
	datetimeutils.py 
Log Message:
Collapsing datetime and datetimetz into datetime, and time and timetz
into time, as discussed on Zope3-Dev.


=== Zope3/src/zope/app/datetimeutils.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/datetimeutils.py:1.3	Thu Jan  2 16:12:31 2003
+++ Zope3/src/zope/app/datetimeutils.py	Wed Jan  8 15:18:26 2003
@@ -979,12 +979,12 @@
         return 'tzinfo(%d)' % minutes
 
 
-from datetime import datetimetz as _datetimetz
+from datetime import datetime as _datetime
 def parseDatetimetz(string):
     y, mo, d, h, m, s, tz = parse(string)
     s, micro = divmod(s, 1.0)
     micro = round(micro * 1000000)
     offset = _tzoffset(tz, None) / 60
-    return _datetimetz(y, mo, d, h, m, s, micro, tzinfo(offset))
+    return _datetime(y, mo, d, h, m, s, micro, tzinfo(offset))
 
 _iso_tz_re = re.compile("[-+]\d\d:\d\d$")