Commit daa85be1 authored by Jim Fulton's avatar Jim Fulton

rid of Persistence module reference

parent 81b7c072
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
__doc__='''Generic Database Connection Support __doc__='''Generic Database Connection Support
$Id: Connection.py,v 1.14 1998/05/11 15:00:24 jim Exp $''' $Id: Connection.py,v 1.15 1998/11/23 16:12:08 jim Exp $'''
__version__='$Revision: 1.14 $'[11:-2] __version__='$Revision: 1.15 $'[11:-2]
import Globals, OFS.SimpleItem, AccessControl.Role, Persistence, Acquisition, sys import Globals, OFS.SimpleItem, AccessControl.Role, Acquisition, sys
from DateTime import DateTime from DateTime import DateTime
from App.Dialogs import MessageDialog from App.Dialogs import MessageDialog
from Globals import HTMLFile from Globals import HTMLFile
from string import find, join, split from string import find, join, split
class Connection( class Connection(
Persistence.Persistent, Globals.Persistent,
AccessControl.Role.RoleManager, AccessControl.Role.RoleManager,
OFS.SimpleItem.Item, OFS.SimpleItem.Item,
Acquisition.Implicit, Acquisition.Implicit,
...@@ -52,7 +52,7 @@ class Connection( ...@@ -52,7 +52,7 @@ class Connection(
self.edit(title, connection_string, check) self.edit(title, connection_string, check)
def __setstate__(self, state): def __setstate__(self, state):
Persistence.Persistent.__setstate__(self, state) Globals.Persistent.__setstate__(self, state)
if self.connection_string: if self.connection_string:
try: self.connect(self.connection_string) try: self.connect(self.connection_string)
except: pass except: pass
...@@ -142,6 +142,9 @@ class Connection( ...@@ -142,6 +142,9 @@ class Connection(
############################################################################## ##############################################################################
# #
# $Log: Connection.py,v $ # $Log: Connection.py,v $
# Revision 1.15 1998/11/23 16:12:08 jim
# rid of Persistence module reference
#
# Revision 1.14 1998/05/11 15:00:24 jim # Revision 1.14 1998/05/11 15:00:24 jim
# Updated permissions. # Updated permissions.
# #
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
__doc__='''Generic Database adapter __doc__='''Generic Database adapter
$Id: DA.py,v 1.51 1998/08/03 13:45:10 jim Exp $''' $Id: DA.py,v 1.52 1998/11/23 16:12:08 jim Exp $'''
__version__='$Revision: 1.51 $'[11:-2] __version__='$Revision: 1.52 $'[11:-2]
import OFS.SimpleItem, Aqueduct.Aqueduct, Aqueduct.RDB import OFS.SimpleItem, Aqueduct.Aqueduct, Aqueduct.RDB
import DocumentTemplate, marshal, md5, base64, DateTime, Acquisition, os import DocumentTemplate, marshal, md5, base64, DateTime, Acquisition, os
...@@ -20,7 +20,7 @@ from Aqueduct.Aqueduct import decodestring, parse, Rotor ...@@ -20,7 +20,7 @@ from Aqueduct.Aqueduct import decodestring, parse, Rotor
from Aqueduct.Aqueduct import custom_default_report, default_input_form from Aqueduct.Aqueduct import custom_default_report, default_input_form
from Globals import HTMLFile, MessageDialog from Globals import HTMLFile, MessageDialog
from cStringIO import StringIO from cStringIO import StringIO
import sys, Globals, OFS.SimpleItem, AccessControl.Role, Persistence import sys, Globals, OFS.SimpleItem, AccessControl.Role
from string import atoi, find, join, split from string import atoi, find, join, split
import IOBTree, DocumentTemplate, sqlvar, sqltest, sqlgroup import IOBTree, DocumentTemplate, sqlvar, sqltest, sqlgroup
from time import time from time import time
...@@ -42,7 +42,7 @@ class SQL(DocumentTemplate.HTML): ...@@ -42,7 +42,7 @@ class SQL(DocumentTemplate.HTML):
class DA( class DA(
Aqueduct.Aqueduct.BaseQuery,Acquisition.Implicit, Aqueduct.Aqueduct.BaseQuery,Acquisition.Implicit,
Persistence.Persistent, Globals.Persistent,
AccessControl.Role.RoleManager, AccessControl.Role.RoleManager,
OFS.SimpleItem.Item, OFS.SimpleItem.Item,
): ):
...@@ -438,6 +438,9 @@ class Traverse(ExtensionClass.Base): ...@@ -438,6 +438,9 @@ class Traverse(ExtensionClass.Base):
############################################################################## ##############################################################################
# #
# $Log: DA.py,v $ # $Log: DA.py,v $
# Revision 1.52 1998/11/23 16:12:08 jim
# rid of Persistence module reference
#
# Revision 1.51 1998/08/03 13:45:10 jim # Revision 1.51 1998/08/03 13:45:10 jim
# Extensions management aspecs of brains have been moved to App/Extensions. # Extensions management aspecs of brains have been moved to App/Extensions.
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment