[Zope-Checkins] CVS: Zope2 - ApplicationManager.py:1.74.2.1 ImageFile.py:1.13.34.1 PersistentExtra.py:1.6.184.1 ProductContext.py:1.33.2.1 Undo.py:1.25.28.1
andreas@serenade.digicool.com
andreas@serenade.digicool.com
Fri, 15 Jun 2001 13:59:16 -0400
Update of /cvs-repository/Zope2/lib/python/App
In directory serenade:/tmp/cvs-serv8742/lib/python/App
Modified Files:
Tag: ajung-mxdatetime
ApplicationManager.py ImageFile.py PersistentExtra.py
ProductContext.py Undo.py
Log Message:
savepoint
--- Updated File ApplicationManager.py in package Zope2 --
--- ApplicationManager.py 2001/06/07 22:18:43 1.74
+++ ApplicationManager.py 2001/06/15 17:58:43 1.74.2.1
@@ -92,7 +92,7 @@
from OFS.Folder import Folder
from CacheManager import CacheManager
from DavLockManager import DavLockManager
-from DateTime.DateTime import DateTime
+from mx.DateTime import now
from OFS import SimpleItem
from App.Dialogs import MessageDialog
from Product import ProductFolder
@@ -212,7 +212,7 @@
global _v_rcs
global _v_rst
_v_rcs=self.refdict()
- _v_rst=DateTime()
+ _v_rst=now()
def rcdate(self):
return _v_rst
--- Updated File ImageFile.py in package Zope2 --
--- ImageFile.py 2001/03/16 16:36:15 1.13
+++ ImageFile.py 2001/06/15 17:58:43 1.13.34.1
@@ -90,7 +90,7 @@
from Globals import package_home
from Common import rfc1123_date
from string import rfind, split
-from DateTime import DateTime
+from mx.DateTime import DateTimeFrom
from time import time
from os import stat
import Acquisition
@@ -134,7 +134,7 @@
# with common servers such as Apache (which can usually
# understand the screwy date string as a lucky side effect
# of the way they parse it).
- try: mod_since=long(DateTime(header).timeTime())
+ try: mod_since=long(DateTimeFrom(header).ticks())
except: mod_since=None
if mod_since is not None:
if getattr(self, 'lmt', None):
--- Updated File PersistentExtra.py in package Zope2 --
--- PersistentExtra.py 1999/07/08 16:35:17 1.6
+++ PersistentExtra.py 2001/06/15 17:58:43 1.6.184.1
@@ -86,7 +86,7 @@
from class_init import default__class_init__
from Persistence import Persistent
import Globals
-from DateTime import DateTime
+from mx.DateTime import now,DateTimeFrom
Persistent.__dict__['__class_init__']=default__class_init__
@@ -95,13 +95,13 @@
def bobobase_modification_time(self):
jar=self._p_jar
oid=self._p_oid
- if jar is None or oid is None: return DateTime()
+ if jar is None or oid is None: return now()
try:
t=self._p_mtime
- if t is None: return DateTime()
+ if t is None: return now()
except: t=0
- return DateTime(t)
+ return DateTimeFrom(t)
def locked_in_version(self):
"""Was the object modified in any version?
--- Updated File ProductContext.py in package Zope2 --
--- ProductContext.py 2001/06/01 16:19:37 1.33
+++ ProductContext.py 2001/06/15 17:58:43 1.33.2.1
@@ -93,7 +93,7 @@
from zLOG import LOG, WARNING
import string, os.path, re
import stat
-from DateTime import DateTime
+from mx.DateTime import DateTimeFrom,now
from types import ListType, TupleType
from Interface import instancesOfObjectImplements
@@ -345,7 +345,7 @@
# If help directory does not exist, log a warning and return.
try:
- dir_mod_time=DateTime(os.stat(path)[stat.ST_MTIME])
+ dir_mod_time=DateTimeFrom(os.stat(path)[stat.ST_MTIME])
except OSError, (errno, text):
LOG("Zope", WARNING, '%s: %s' % (text, path))
return
@@ -354,7 +354,7 @@
if help.lastRegistered is not None and \
help.lastRegistered >= dir_mod_time:
return
- help.lastRegistered=DateTime()
+ help.lastRegistered=now()
if clear:
for id in help.objectIds('Help Topic'):
--- Updated File Undo.py in package Zope2 --
--- Undo.py 2001/04/12 18:49:02 1.25
+++ Undo.py 2001/06/15 17:58:43 1.25.28.1
@@ -88,7 +88,7 @@
__version__='$Revision$'[11:-2]
import Globals, ExtensionClass
-from DateTime import DateTime
+from mx.DateTime import DateTimeFrom
from string import atof, find, atoi, split, rfind, join
from AccessControl import getSecurityManager
import base64
@@ -167,7 +167,7 @@
encode = base64.encodestring
for d in r:
- d['time']=t=DateTime(d['time'])
+ d['time']=t=DateTimeFrom(d['time'])
desc = d['description']
tid=d['id']
if desc: