[Zope-Checkins] CVS: Zope/lib/python/OFS - Application.py:1.191.2.4

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv26572/lib/python/OFS

Modified Files:
      Tag: Zope-2_7-branch
	Application.py 
Log Message:
Changed to use new-style, rather than old-style (depricated)
BTrees for ZGlobals.


=== Zope/lib/python/OFS/Application.py 1.191.2.3 => 1.191.2.4 ===
--- Zope/lib/python/OFS/Application.py:1.191.2.3	Mon Nov 17 17:34:07 2003
+++ Zope/lib/python/OFS/Application.py	Wed Nov 26 12:44:16 2003
@@ -174,9 +174,9 @@
         result=0
 
         if rebuild:
-            import BTree
-            jar.root()['ZGlobals']=BTree.BTree()
-            result=1
+            from BTrees.OOBTree import OOBTree
+            jar.root()['ZGlobals'] = OOBTree()
+            result = 1
 
         zglobals =jar.root()['ZGlobals']
         reg_has_key=zglobals.has_key
@@ -394,10 +394,10 @@
             get_transaction().commit()
 
     # Make sure we have Globals
-    root=app._p_jar.root()
+    root = app._p_jar.root()
     if not root.has_key('ZGlobals'):
-        import BTree
-        app._p_jar.root()['ZGlobals']=BTree.BTree()
+        from BTrees.OOBTree import OOBTree
+        root['ZGlobals'] = OOBTree()
         get_transaction().note('Added Globals')
         get_transaction().commit()