[Zope3-checkins] CVS: Zope3/src/zope/app/services - folder.py:1.13.6.6 registration.py:1.14.4.8 servicecontainer.py:1.5.2.3

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	folder.py registration.py servicecontainer.py 
Log Message:
Provided automativ data conversion for parentgeddon.


=== Zope3/src/zope/app/services/folder.py 1.13.6.5 => 1.13.6.6 ===
--- Zope3/src/zope/app/services/folder.py:1.13.6.5	Mon Sep 15 14:12:38 2003
+++ Zope3/src/zope/app/services/folder.py	Wed Sep 17 18:29:39 2003
@@ -46,7 +46,7 @@
 # XXX Backward compatability. This is needed to support old pickles.
 Package = SiteManagementFolder
 
-class SiteManagementFolders:
+class SiteManagementFolders(BTreeContainer):
     pass 
 Packages = SiteManagementFolders
 


=== Zope3/src/zope/app/services/registration.py 1.14.4.7 => 1.14.4.8 ===
--- Zope3/src/zope/app/services/registration.py:1.14.4.7	Mon Sep 15 14:12:38 2003
+++ Zope3/src/zope/app/services/registration.py	Wed Sep 17 18:29:39 2003
@@ -474,7 +474,6 @@
             registry = self._bindings[name]
         except KeyError:
             registry = RegistrationStack(self)
-            registry.__parent__ = self
             self._bindings[name] = registry
             self._p_changed = 1
         return registry


=== Zope3/src/zope/app/services/servicecontainer.py 1.5.2.2 => 1.5.2.3 ===
--- Zope3/src/zope/app/services/servicecontainer.py:1.5.2.2	Fri Sep 12 17:22:36 2003
+++ Zope3/src/zope/app/services/servicecontainer.py	Wed Sep 17 18:29:39 2003
@@ -69,9 +69,10 @@
         database = event.database
         connection = database.open()
         app = connection.root().get('Application')
-        if app is None:
+        if app is None or ISite.isImplementedBy(app):
             # No old data
             return
+        print "Fixing up sites that don't implement ISite"
         fixfolder(app)
         get_transaction().commit()
         connection.close()