[Checkins] SVN: zope.browserresource/trunk/s Get rid of zope.datetime dependency.

[Dan Korostelev]

Log message for revision 103195:
  Get rid of zope.datetime dependency.

Changed:
  U   zope.browserresource/trunk/setup.py
  U   zope.browserresource/trunk/src/zope/browserresource/file.py

-=-
Modified: zope.browserresource/trunk/setup.py
===================================================================
--- zope.browserresource/trunk/setup.py	2009-08-25 11:19:29 UTC (rev 103194)
+++ zope.browserresource/trunk/setup.py	2009-08-25 11:25:04 UTC (rev 103195)
@@ -43,7 +43,6 @@
                         'zope.component>=3.7.0',
                         'zope.configuration',
                         'zope.contenttype',
-                        'zope.datetime',
                         'zope.i18n',
                         'zope.interface',
                         'zope.location',

Modified: zope.browserresource/trunk/src/zope/browserresource/file.py
===================================================================
--- zope.browserresource/trunk/src/zope/browserresource/file.py	2009-08-25 11:19:29 UTC (rev 103194)
+++ zope.browserresource/trunk/src/zope/browserresource/file.py	2009-08-25 11:25:04 UTC (rev 103195)
@@ -19,12 +19,11 @@
 import os
 import time
 try:
-    from email.utils import formatdate
+    from email.utils import formatdate, parsedate_tz, mktime_tz
 except ImportError: # python 2.4
-    from email.Utils import formatdate
+    from email.Utils import formatdate, parsedate_tz, mktime_tz
 
 from zope.contenttype import guess_content_type
-from zope.datetime import time as timeFromDateTimeString
 from zope.interface import implements, classProvides
 from zope.publisher.browser import BrowserView
 from zope.publisher.interfaces import NotFound
@@ -136,7 +135,7 @@
             # understand the screwy date string as a lucky side effect
             # of the way they parse it).
             try:
-                mod_since = long(timeFromDateTimeString(header))
+                mod_since = long(mktime_tz(parsedate_tz(header)))
             except:
                 mod_since = None
             if mod_since is not None: