[Zope3-checkins] CVS: Zope3/src/zope/app/content - dtmlpage.py:1.8 file.py:1.14 folder.py:1.17 i18nfile.py:1.6 sql.py:1.13 zpt.py:1.18

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv22507/src/zope/app/content

Modified Files:
	dtmlpage.py file.py folder.py i18nfile.py sql.py zpt.py 
Log Message:


update to replace ZODB 4 with ZODB 3


=== Zope3/src/zope/app/content/dtmlpage.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/content/dtmlpage.py:1.7	Sun Sep 21 13:31:49 2003
+++ Zope3/src/zope/app/content/dtmlpage.py	Fri Feb 20 11:57:24 2004
@@ -14,7 +14,7 @@
 """
 $Id$
 """
-from persistence import Persistent
+from persistent import Persistent
 
 from zope.app.interfaces.annotation import IAnnotatable
 from zope.app.interfaces.content.file import IFileContent


=== Zope3/src/zope/app/content/file.py 1.13 => 1.14 ===
--- Zope3/src/zope/app/content/file.py:1.13	Tue Aug 26 14:17:18 2003
+++ Zope3/src/zope/app/content/file.py	Fri Feb 20 11:57:24 2004
@@ -15,7 +15,7 @@
 
 $Id$
 """
-from persistence import Persistent
+from persistent import Persistent
 from transaction import get_transaction
 from zope.interface import implements
 
@@ -99,7 +99,7 @@
 
         # Make sure we have an _p_jar, even if we are a new object, by
         # doing a sub-transaction commit.
-        get_transaction().savepoint()
+        get_transaction().commit(1)
 
         jar = self._p_jar
 


=== Zope3/src/zope/app/content/folder.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/content/folder.py:1.16	Sun Sep 21 13:31:50 2003
+++ Zope3/src/zope/app/content/folder.py	Fri Feb 20 11:57:24 2004
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-from persistence import Persistent
+from persistent import Persistent
 from zodb.btrees.OOBTree import OOBTree
 from zope.app.content.fssync import DirectoryAdapter
 from zope.app.interfaces.content.folder import IFolder, IRootFolder


=== Zope3/src/zope/app/content/i18nfile.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/content/i18nfile.py:1.5	Fri Feb 13 22:27:14 2004
+++ Zope3/src/zope/app/content/i18nfile.py	Fri Feb 20 11:57:24 2004
@@ -15,7 +15,8 @@
 
 $Id$
 """
-import persistence
+
+import persistent
 from zope.app.interfaces.content.i18n import II18nFile
 from zope.app.content.file import File
 from zope.interface import implements
@@ -23,7 +24,7 @@
 # XXX We shouldn't be dependent on Browser here! Aaaargh.
 from zope.publisher.browser import FileUpload
 
-class I18nFile(persistence.Persistent):
+class I18nFile(persistent.Persistent):
     """I18n aware file object.  It contains a number of File objects --
     one for each language.
     """


=== Zope3/src/zope/app/content/sql.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/content/sql.py:1.12	Fri Dec 19 11:53:15 2003
+++ Zope3/src/zope/app/content/sql.py	Fri Feb 20 11:57:24 2004
@@ -150,8 +150,8 @@
 
 from types import StringTypes
 
-from persistence import Persistent
-from persistence.dict import PersistentDict
+from persistent import Persistent
+from persistent.dict import PersistentDict
 
 from zope.documenttemplate.dt_html import HTML
 from zope.documenttemplate.dt_util import ParseError, parse_params, name_param


=== Zope3/src/zope/app/content/zpt.py 1.17 => 1.18 ===
--- Zope3/src/zope/app/content/zpt.py:1.17	Sun Sep 21 13:31:52 2003
+++ Zope3/src/zope/app/content/zpt.py	Fri Feb 20 11:57:24 2004
@@ -16,7 +16,7 @@
 """
 import re
 
-from persistence import Persistent
+from persistent import Persistent
 
 from zope.proxy import removeAllProxies
 from zope.security.proxy import ProxyFactory