[Zope3-checkins] CVS: Zope3/src/zope/app/content - zpt.py:1.17.10.1 sql.py:1.12.2.1 i18nfile.py:1.4.20.1 folder.py:1.16.10.1 file.py:1.13.14.2 dtmlpage.py:1.7.10.1

[Jeremy Hylton]

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

Modified Files:
      Tag: zope3-zodb3-devel-branch
	zpt.py sql.py i18nfile.py folder.py file.py dtmlpage.py 
Log Message:
persistence -> persistent


=== Zope3/src/zope/app/content/zpt.py 1.17 => 1.17.10.1 ===
--- Zope3/src/zope/app/content/zpt.py:1.17	Sun Sep 21 13:31:52 2003
+++ Zope3/src/zope/app/content/zpt.py	Thu Feb 12 16:22:04 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


=== Zope3/src/zope/app/content/sql.py 1.12 => 1.12.2.1 ===
--- Zope3/src/zope/app/content/sql.py:1.12	Fri Dec 19 11:53:15 2003
+++ Zope3/src/zope/app/content/sql.py	Thu Feb 12 16:22:04 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/i18nfile.py 1.4 => 1.4.20.1 ===
--- Zope3/src/zope/app/content/i18nfile.py:1.4	Wed Jul 23 17:46:18 2003
+++ Zope3/src/zope/app/content/i18nfile.py	Thu Feb 12 16:22:04 2004
@@ -16,7 +16,7 @@
 $Id$
 """
 
-import persistence
+import persistent
 from zope.app.interfaces.content.i18nfile import II18nFile
 from zope.app.content.file import File
 from zope.interface import implements
@@ -24,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/folder.py 1.16 => 1.16.10.1 ===
--- Zope3/src/zope/app/content/folder.py:1.16	Sun Sep 21 13:31:50 2003
+++ Zope3/src/zope/app/content/folder.py	Thu Feb 12 16:22:04 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/file.py 1.13.14.1 => 1.13.14.2 ===
--- Zope3/src/zope/app/content/file.py:1.13.14.1	Fri Jan 16 10:43:31 2004
+++ Zope3/src/zope/app/content/file.py	Thu Feb 12 16:22:04 2004
@@ -15,7 +15,7 @@
 
 $Id$
 """
-from persistence import Persistent
+from persistent import Persistent
 from transaction import get_transaction
 from zope.interface import implements
 


=== Zope3/src/zope/app/content/dtmlpage.py 1.7 => 1.7.10.1 ===
--- Zope3/src/zope/app/content/dtmlpage.py:1.7	Sun Sep 21 13:31:49 2003
+++ Zope3/src/zope/app/content/dtmlpage.py	Thu Feb 12 16:22:04 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