[Checkins] SVN: Zope3/branches/jim-adapter/src/ Adjust to new
location of datetimeutils.
Philipp von Weitershausen
philikon at philikon.de
Mon Apr 3 00:59:56 EDT 2006
Log message for revision 66344:
Adjust to new location of datetimeutils.
Changed:
U Zope3/branches/jim-adapter/src/bugtracker/tests/test_xmlexportimport.py
U Zope3/branches/jim-adapter/src/z3checkins/browser.py
U Zope3/branches/jim-adapter/src/z3checkins/message.py
U Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zopedublincore.py
U Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py
U Zope3/branches/jim-adapter/src/zope/app/form/browser/ftests/test_datetimewidget.py
U Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datetimewidget.py
U Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datewidget.py
U Zope3/branches/jim-adapter/src/zope/app/form/browser/textwidgets.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fileresource.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/fieldconverters.py
U Zope3/branches/jim-adapter/src/zope/app/publisher/fileresource.py
U Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py
-=-
Modified: Zope3/branches/jim-adapter/src/bugtracker/tests/test_xmlexportimport.py
===================================================================
--- Zope3/branches/jim-adapter/src/bugtracker/tests/test_xmlexportimport.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/bugtracker/tests/test_xmlexportimport.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -18,8 +18,8 @@
import unittest, os
from datetime import datetime
+from zope.datetime import parseDatetimetz
from zope.app.file import File
-from zope.app.datetimeutils import parseDatetimetz
from zope.app.dublincore.interfaces import IZopeDublinCore
from bugtracker import tests
Modified: Zope3/branches/jim-adapter/src/z3checkins/browser.py
===================================================================
--- Zope3/branches/jim-adapter/src/z3checkins/browser.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/z3checkins/browser.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -10,9 +10,9 @@
from zope.interface import implements
from zope.exceptions import DuplicationError
from zope.proxy import removeAllProxies
+from zope.datetime import parseDatetimetz, DateTimeError
from zope.app import zapi
-from zope.app.datetimeutils import parseDatetimetz, DateTimeError
from zope.app.publisher.browser import BrowserView
from zope.app.form import CustomWidgetFactory
from zope.app.form.browser import FileWidget
Modified: Zope3/branches/jim-adapter/src/z3checkins/message.py
===================================================================
--- Zope3/branches/jim-adapter/src/z3checkins/message.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/z3checkins/message.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -27,11 +27,11 @@
from zope.exceptions import DuplicationError
from zope.interface import implements
from zope.proxy import removeAllProxies
+from zope.datetime import parseDatetimetz, DateTimeError
from zope.app import zapi
from zope.app.container.contained import Contained
from zope.app.container.interfaces import IReadContainer
-from zope.app.datetimeutils import parseDatetimetz, DateTimeError
from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.form import CustomWidgetFactory
from zope.app.form.browser import FileWidget
Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zopedublincore.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zopedublincore.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zopedublincore.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -157,7 +157,7 @@
(u'foo \u1111', u'2001-12-31'),
])
- from zope.app.datetimeutils import parseDatetimetz
+ from zope.datetime import parseDatetimetz
dc = self.dc
self.assertEqual(dc.created,
Modified: Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -20,9 +20,8 @@
from datetime import datetime
from zope.interface import implements
-
+from zope.datetime import parseDatetimetz
from zope.app.dublincore.interfaces import IZopeDublinCore
-from zope.app.datetimeutils import parseDatetimetz
class SimpleProperty(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/ftests/test_datetimewidget.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/ftests/test_datetimewidget.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/ftests/test_datetimewidget.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -17,16 +17,15 @@
"""
import unittest
import re
-from persistent import Persistent
+
import transaction
+import zope.security.checker
+from persistent import Persistent
from datetime import datetime
-from zope.app.datetimeutils import parseDatetimetz, tzinfo
-
+from zope.datetime import parseDatetimetz, tzinfo
from zope.interface import Interface
from zope.interface import implements
-
from zope.schema import Datetime, Choice
-import zope.security.checker
from support import *
from zope.app.traversing.api import traverse
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datetimewidget.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datetimewidget.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datetimewidget.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest, doctest
-from zope.app.datetimeutils import parseDatetimetz
+from zope.datetime import parseDatetimetz
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.app.form.interfaces import IInputWidget
from zope.app.form.browser import DatetimeWidget
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datewidget.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datewidget.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/tests/test_datewidget.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest, doctest
-from zope.app.datetimeutils import parseDatetimetz
+from zope.datetime import parseDatetimetz
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.app.form.interfaces import IInputWidget
from zope.app.form.browser import DateWidget
Modified: Zope3/branches/jim-adapter/src/zope/app/form/browser/textwidgets.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/form/browser/textwidgets.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/form/browser/textwidgets.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -19,13 +19,13 @@
from xml.sax import saxutils
from zope.interface import implements
+from zope.datetime import parseDatetimetz
+from zope.datetime import DateTimeError
from zope.app.form.interfaces import IInputWidget, ConversionError
from zope.app.form.browser.interfaces import ITextBrowserWidget
from zope.app.form.browser.widget import SimpleInputWidget, renderElement
from zope.app.form.browser.widget import DisplayWidget
-from zope.app.datetimeutils import parseDatetimetz
-from zope.app.datetimeutils import DateTimeError
from zope.app.i18n import ZopeMessageFactory as _
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fileresource.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fileresource.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/browser/fileresource.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -17,20 +17,16 @@
"""
import time
-
+from zope.security.proxy import Proxy
+from zope.interface import implements
+from zope.datetime import time as timeFromDateTimeString
from zope.publisher.interfaces import NotFound
-
-from zope.app.publisher.browser import BrowserView
from zope.publisher.interfaces.browser import IBrowserPublisher
+from zope.app.publisher.browser import BrowserView
from zope.app.publisher.fileresource import File, Image
from zope.app.publisher.browser.resource import Resource
-from zope.app.datetimeutils import time as timeFromDateTimeString
-from zope.security.proxy import Proxy
-
-from zope.interface import implements
-
class FileResource(BrowserView, Resource):
implements(IBrowserPublisher)
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/fieldconverters.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/fieldconverters.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/fieldconverters.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -18,13 +18,13 @@
from datetime import datetime
from zope.publisher.browser import registerTypeConverter
-from zope.app.datetimeutils import parse as parseDateTime
+from zope.datetime import parse as parseDateTime
def field2date_via_datetimeutils(v):
"""Converter for request fields marshalled as ':date'.
o TODO: Uses the non-localized and non-tzinfo-aware 'parseDateTime'
- utility from zope.app.datetimeutils; a better alternative
+ utility from zope.datetime; a better alternative
would be more I18N / L10N aware, perhaps even adapting to
the expressed preferences of the user.
"""
Modified: Zope3/branches/jim-adapter/src/zope/app/publisher/fileresource.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/publisher/fileresource.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/publisher/fileresource.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -21,7 +21,7 @@
from time import time
from zope.app.contenttypes import guess_content_type
-from zope.app.datetimeutils import rfc1123_date
+from zope.datetime import rfc1123_date
class File(object):
Modified: Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py 2006-04-03 04:59:49 UTC (rev 66343)
+++ Zope3/branches/jim-adapter/src/zope/app/versioncontrol/repository.py 2006-04-03 04:59:55 UTC (rev 66344)
@@ -25,10 +25,9 @@
import zope.event
import zope.interface
+import zope.datetime
-from zope.app import datetimeutils
from zope.app import zapi
-
from zope.app.annotation.interfaces import IAnnotations
from zope.app.versioncontrol import event
@@ -500,8 +499,8 @@
sticky = ('B', selector)
else:
try:
- timestamp = datetimeutils.time(selector)
- except datetimeutils.DateTimeError:
+ timestamp = zope.datetime.time(selector)
+ except zope.datetime.DateTimeError:
raise VersionControlError(
'Invalid version selector: %s' % selector
)
More information about the Checkins
mailing list