[Zope3-checkins] CVS: Zope3/lib/python/Persistence - IPersistentModuleRegistry.py:1.3 IPersistentDataManager.py:1.3 IPersistent.py:1.8 ICache.py:1.3

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/Persistence
In directory cvs.zope.org:/tmp/cvs-serv2314/Persistence

Modified Files:
	IPersistentModuleRegistry.py IPersistentDataManager.py 
	IPersistent.py ICache.py 
Log Message:
We now expect the Interface package to be present.








=== Zope3/lib/python/Persistence/IPersistentModuleRegistry.py 1.2 => 1.3 ===
--- Zope3/lib/python/Persistence/IPersistentModuleRegistry.py:1.2	Thu Oct  3 00:16:59 2002
+++ Zope3/lib/python/Persistence/IPersistentModuleRegistry.py	Tue Dec  3 12:23:03 2002
@@ -11,11 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
-try:
-    from Interface import Interface
-except ImportError:
-    class Interface:
-        pass
+from Interface import Interface
 
 class IPersistentModuleImportRegistry(Interface):
 


=== Zope3/lib/python/Persistence/IPersistentDataManager.py 1.2 => 1.3 ===
--- Zope3/lib/python/Persistence/IPersistentDataManager.py:1.2	Mon Jun 10 19:27:42 2002
+++ Zope3/lib/python/Persistence/IPersistentDataManager.py	Tue Dec  3 12:23:03 2002
@@ -11,10 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
-try:
-    from Interface import Interface
-except ImportError:
-    class Interface: pass
+from Interface import Interface
 
 class IPersistentDataManager(Interface):
     """Provide services for managing persistent state.


=== Zope3/lib/python/Persistence/IPersistent.py 1.7 => 1.8 ===
--- Zope3/lib/python/Persistence/IPersistent.py:1.7	Fri Nov  8 12:30:39 2002
+++ Zope3/lib/python/Persistence/IPersistent.py	Tue Dec  3 12:23:03 2002
@@ -11,12 +11,8 @@
 # FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
-try:
-    from Interface import Interface
-    from Interface.Attribute import Attribute
-except ImportError:
-    class Interface: pass
-    def Attribute(*args): return args
+from Interface import Interface
+from Interface.Attribute import Attribute
 
 class IPersistent(Interface):
     """Python persistence interface


=== Zope3/lib/python/Persistence/ICache.py 1.2 => 1.3 ===
--- Zope3/lib/python/Persistence/ICache.py:1.2	Mon Jun 10 19:27:42 2002
+++ Zope3/lib/python/Persistence/ICache.py	Tue Dec  3 12:23:03 2002
@@ -11,10 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
-try:
-    from Interface import Interface
-except ImportError:
-    class Interface: pass
+from Interface import Interface
 
 class ICache(Interface):
     """In-memory object cache