[Checkins] SVN: Products.ZopeVersionControl/trunk/ Fixed deprecation warnings for use of Globals. Specified package dependencies.

Hanno Schlichting plone at hannosch.info
Wed Jan 14 06:21:41 EST 2009


Log message for revision 94734:
  Fixed deprecation warnings for use of Globals. Specified package dependencies.
  

Changed:
  U   Products.ZopeVersionControl/trunk/CHANGES.txt
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Repository.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/SequenceWrapper.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Utility.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Version.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionSupport.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py
  U   Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py
  U   Products.ZopeVersionControl/trunk/setup.py

-=-
Modified: Products.ZopeVersionControl/trunk/CHANGES.txt
===================================================================
--- Products.ZopeVersionControl/trunk/CHANGES.txt	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/CHANGES.txt	2009-01-14 11:21:40 UTC (rev 94734)
@@ -4,6 +4,10 @@
 1.0a2 (unreleased)
 ------------------
 
+    - Fixed deprecation warnings for use of Globals. Specified package
+      dependencies.
+      [hannosch]
+
     - Purge old zope2 Interface interfaces for Zope 2.12 compatibility.
       Note that they are internal to the implementation of this module.
 

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -11,7 +11,8 @@
 # 
 ##############################################################################
 
-from Globals import InitializeClass, Persistent
+from App.class_init import InitializeClass
+from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 from BTrees.IOBTree import IOBTree
 from Utility import _findUserId

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Repository.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Repository.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Repository.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -18,7 +18,8 @@
 
 from Acquisition import Implicit, aq_parent, aq_inner
 from ZopeVersionHistory import ZopeVersionHistory
-from Globals import InitializeClass, Persistent
+from App.class_init import InitializeClass
+from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 from Utility import use_vc_permission, _findPath
 from Utility import isAVersionableResource, VersionControlError, VersionInfo

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/SequenceWrapper.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/SequenceWrapper.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/SequenceWrapper.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -11,7 +11,8 @@
 # 
 ##############################################################################
 
-from Globals import InitializeClass, Persistent
+from App.class_init import InitializeClass
+from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 
 

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Utility.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Utility.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Utility.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -18,7 +18,8 @@
 from AccessControl import getSecurityManager
 from App.Common import package_home
 from DateTime import DateTime
-from Globals import InitializeClass, Persistent
+from App.class_init import InitializeClass
+from Persistence import Persistent
 from ZODB.TimeStamp import TimeStamp
 
 try:

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Version.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Version.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/Version.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -19,7 +19,8 @@
 from cPickle import Pickler, Unpickler
 
 from Acquisition import Implicit, aq_parent, aq_inner, aq_base
-from Globals import InitializeClass, Persistent
+from App.class_init import InitializeClass
+from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 from BTrees.OOBTree import OOBTree
 from OFS.SimpleItem import SimpleItem

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -13,7 +13,8 @@
 
 __version__='$Revision: 1.4 $'[11:-2]
 
-from Globals import InitializeClass, Persistent
+from App.class_init import InitializeClass
+from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 from EventLog import EventLog, LogEntry
 from Utility import VersionControlError

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionSupport.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionSupport.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionSupport.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -14,7 +14,8 @@
 __version__='$Revision: 1.4 $'[11:-2]
 
 import ExtensionClass, AccessControl, Acquisition
-from Globals import DTMLFile, InitializeClass
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
 from Utility import VersionControlError, isAVersionableResource
 from Utility import use_vc_permission
 

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -13,7 +13,8 @@
 
 __version__='$Revision: 1.5 $'[11:-2]
 
-from Globals import DTMLFile, InitializeClass
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
 from SequenceWrapper import SequenceWrapper
 import OFS, AccessControl
 import Repository

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -13,7 +13,8 @@
 
 __version__='$Revision: 1.6 $'[11:-2]
 
-from Globals import DTMLFile, InitializeClass
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
 import OFS, AccessControl
 import Version
 

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -13,7 +13,8 @@
 
 __version__='$Revision: 1.2 $'[11:-2]
 
-from Globals import DTMLFile, InitializeClass
+from App.class_init import InitializeClass
+from App.special_dtml import DTMLFile
 import OFS, AccessControl, Acquisition
 import VersionHistory
 

Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -13,9 +13,10 @@
 
 __version__='$Revision: 1.4 $'[11:-2]
 
-import ZopeRepository, OFS, App, Globals
+import ZopeRepository, OFS
+from App.class_init import InitializeClass
+from App.ImageFile import ImageFile
 
-
 def initialize(context):
 
     context.registerClass(
@@ -61,10 +62,10 @@
             if name != 'manage_options':
                 dict[name] = value
 
-        Globals.InitializeClass(_class)
+        InitializeClass(_class)
 
 
 def registerIcon(filename):
     setattr(OFS.misc_.misc_.ZopeVersionControl, filename, 
-            App.ImageFile.ImageFile('www/%s' % filename, globals())
+            ImageFile('www/%s' % filename, globals())
             )

Modified: Products.ZopeVersionControl/trunk/setup.py
===================================================================
--- Products.ZopeVersionControl/trunk/setup.py	2009-01-14 10:30:22 UTC (rev 94733)
+++ Products.ZopeVersionControl/trunk/setup.py	2009-01-14 11:21:40 UTC (rev 94734)
@@ -17,5 +17,11 @@
       zip_safe=False,
       install_requires=[
         'setuptools',
+        'zope.interface',
+        # 'Acquisition',
+        # 'DateTime',
+        # 'transaction',
+        # 'ZODB3',
+        # 'Zope2',
       ],
       )



More information about the Checkins mailing list