[Zope-Checkins] CVS: Zope2 - Aqueduct.py:1.49.2.1 Connection.py:1.33.66.1 DA.py:1.102.14.1 RDB.py:1.30.14.1
andreas@serenade.digicool.com
andreas@serenade.digicool.com
Fri, 15 Jun 2001 13:58:53 -0400
Update of /cvs-repository/Zope2/lib/python/Shared/DC/ZRDB
In directory serenade:/tmp/cvs-serv8742/lib/python/Shared/DC/ZRDB
Modified Files:
Tag: ajung-mxdatetime
Aqueduct.py Connection.py DA.py RDB.py
Log Message:
savepoint
--- Updated File Aqueduct.py in package Zope2 --
--- Aqueduct.py 2001/05/16 15:13:00 1.49
+++ Aqueduct.py 2001/06/15 17:58:49 1.49.2.1
@@ -89,9 +89,9 @@
import Globals, os
from Globals import Persistent
-import DocumentTemplate, DateTime, re, string
+import DocumentTemplate, re, string
import binascii, Acquisition
-DateTime.now=DateTime.DateTime
+from mx.DateTime import now
from cStringIO import StringIO
from OFS import SimpleItem
from AccessControl.Role import RoleManager
@@ -110,7 +110,7 @@
def query_year(self): return self.query_date.year()
def query_month(self): return self.query_date.month()
def query_day(self): return self.query_date.day()
- query_date=DateTime.now()
+ query_date=now()
manage_options=()
def quoted_input(self): return quotedHTML(self.input_src)
--- Updated File Connection.py in package Zope2 --
--- Connection.py 2001/01/12 16:46:50 1.33
+++ Connection.py 2001/06/15 17:58:49 1.33.66.1
@@ -88,7 +88,7 @@
__version__='$Revision$'[11:-2]
import Globals, OFS.SimpleItem, AccessControl.Role, Acquisition, sys
-from DateTime import DateTime
+from mx.DateTime import now
from App.Dialogs import MessageDialog
from Globals import DTMLFile
from string import find, join, split
@@ -245,7 +245,7 @@
'<!--\n%s\n%s\n-->\n'
% (s,t,v)), tb
finally: tb=None
- self._v_connected=DateTime()
+ self._v_connected=now()
return self
--- Updated File DA.py in package Zope2 --
--- DA.py 2001/04/27 20:27:55 1.102
+++ DA.py 2001/06/15 17:58:49 1.102.14.1
@@ -98,7 +98,7 @@
import DocumentTemplate, sqlvar, sqltest, sqlgroup
from time import time
from zlib import compress, decompress
-from DateTime.DateTime import DateTime
+from mx.DateTime import now,ARPA
md5new=md5.new
import ExtensionClass
import DocumentTemplate.DT_Util
@@ -200,7 +200,7 @@
rows=max(1,atoi(sql_pref__rows)+dr)
cols=max(40,atoi(sql_pref__cols)+dc)
- e=(DateTime('GMT') + 365).rfc822()
+ e=ARPA.strGMT(now() + 365)
resp=REQUEST['RESPONSE']
resp.setCookie('sql_pref__rows',str(rows),path='/',expires=e)
resp.setCookie('sql_pref__cols',str(cols),path='/',expires=e)
--- Updated File RDB.py in package Zope2 --
--- RDB.py 2001/04/27 18:07:16 1.30
+++ RDB.py 2001/06/15 17:58:49 1.30.14.1
@@ -89,7 +89,7 @@
__version__='$Revision$'[11:-2]
from string import split, strip, lower, upper, atof, atoi, atol, find, join,find
-import DateTime
+from mx.DateTime import DateTimeFrom
from Missing import MV
from array import array
from Record import Record
@@ -108,7 +108,7 @@
Parsers={'n': atof,
'i': atoi,
'l': atol,
- 'd': DateTime.DateTime,
+ 'd': DateTimeFrom,
't': parse_text,
}