more py3 compatibility

src/Products/ZopeVersionControl/EventLog.py

@@ -11,11 +11,12 @@
 #
 ##############################################################################
 
+from .Utility import _findUserId
 from App.class_init import default__class_init__ as InitializeClass
-from Persistence import Persistent
 from AccessControl import ClassSecurityInfo
 from BTrees.IOBTree import IOBTree
-from Utility import _findUserId
+from Persistence import Persistent
+
 import time
 
 MAX32 = int(2**31 - 1)

src/Products/ZopeVersionControl/Repository.py

@@ -11,25 +11,22 @@
 #
 ##############################################################################
 
-__version__='$Revision: 1.14 $'[11:-2]
-
-import time
-from random import randint
-
+from . import Utility
+from .EventLog import LogEntry
+from .nonversioned import getNonVersionedData, restoreNonVersionedData
+from .Utility import isAVersionableResource, VersionControlError, VersionInfo
+from .Utility import use_vc_permission, _findPath
+from .ZopeVersionHistory import ZopeVersionHistory
+from AccessControl import ClassSecurityInfo
 from Acquisition import Implicit, aq_parent, aq_inner
-from ZopeVersionHistory import ZopeVersionHistory
 from App.class_init import default__class_init__ as InitializeClass
-from Persistence import Persistent
-from AccessControl import ClassSecurityInfo
-from Utility import use_vc_permission, _findPath
-from Utility import isAVersionableResource, VersionControlError, VersionInfo
-from DateTime.DateTime import DateTime
-from BTrees.OOBTree import OOBTree
 from BTrees.OIBTree import OIBTree
+from BTrees.OOBTree import OOBTree
+from DateTime.DateTime import DateTime
+from Persistence import Persistent
+from random import randint
 
-from EventLog import LogEntry
-import Utility
-from nonversioned import getNonVersionedData, restoreNonVersionedData
+import time
 
 
 class Repository(Implicit, Persistent):

src/Products/ZopeVersionControl/Version.py

@@ -22,10 +22,10 @@
 from AccessControl import ClassSecurityInfo
 from BTrees.OOBTree import OOBTree
 from OFS.SimpleItem import SimpleItem
-from Utility import VersionControlError
+from .Utility import VersionControlError
 from ZODB._compat import BytesIO
 from ZODB._compat import Pickler, Unpickler
-from nonversioned import listNonVersionedObjects, removeNonVersionedData
+from .nonversioned import listNonVersionedObjects, removeNonVersionedData
 
 
 def cloneByPickle(obj, ignore_list=()):

src/Products/ZopeVersionControl/VersionHistory.py

@@ -11,18 +11,17 @@
 #
 ##############################################################################
 
-__version__='$Revision: 1.4 $'[11:-2]
-
-from App.class_init import default__class_init__ as InitializeClass
-from Persistence import Persistent
+from .EventLog import EventLog, LogEntry
+from .Utility import VersionControlError
+from .ZopeVersion import ZopeVersion
 from AccessControl import ClassSecurityInfo
-from EventLog import EventLog, LogEntry
-from Utility import VersionControlError
-from ZopeVersion import ZopeVersion
-from BTrees.IOBTree import IOBTree
+from Acquisition import Implicit
+from App.class_init import default__class_init__ as InitializeClass
 from BTrees.IIBTree import IIBTree
+from BTrees.IOBTree import IOBTree
 from BTrees.OOBTree import OOBTree
-from Acquisition import Implicit
+from Persistence import Persistent
+
 import time
 
 MAX32 = int(2**31 - 1)

src/Products/ZopeVersionControl/VersionSupport.py

@@ -11,13 +11,13 @@
 #
 ##############################################################################
 
-__version__='$Revision: 1.4 $'[11:-2]
-
-import ExtensionClass, AccessControl, Acquisition
+from .Utility import use_vc_permission
+from .Utility import VersionControlError, isAVersionableResource
 from App.class_init import default__class_init__ as InitializeClass
 from App.special_dtml import DTMLFile
-from Utility import VersionControlError, isAVersionableResource
-from Utility import use_vc_permission
+
+import AccessControl
+import ExtensionClass
 
 
 class VersionSupport(ExtensionClass.Base):

src/Products/ZopeVersionControl/ZopeRepository.py

@@ -11,12 +11,13 @@
 #
 ##############################################################################
 
+from . import Repository
+from .SequenceWrapper import SequenceWrapper
 from App.class_init import default__class_init__ as InitializeClass
 from App.special_dtml import DTMLFile
-from SequenceWrapper import SequenceWrapper
+
 import AccessControl
 import OFS
-import Repository
 
 # BBB Zope 2.12
 try:
@@ -77,7 +78,7 @@ def __getitem__(self, name):
         history = self._histories.get(name)
         if history is not None:
             return history.__of__(self)
-        raise KeyError, name
+        raise KeyError(name)
 
     security.declarePrivate('objectIds')
     def objectIds(self, spec=None):

src/Products/ZopeVersionControl/ZopeVersion.py

@@ -11,10 +11,12 @@
 #
 ##############################################################################
 
+from . import Version
 from App.class_init import default__class_init__ as InitializeClass
 from App.special_dtml import DTMLFile
-import OFS, AccessControl
-import Version
+
+import OFS
+import AccessControl
 
 # BBB Zope 2.12
 try:

src/Products/ZopeVersionControl/ZopeVersionHistory.py

@@ -11,10 +11,12 @@
 #
 ##############################################################################
 
+from . import VersionHistory
 from App.class_init import default__class_init__ as InitializeClass
 from App.special_dtml import DTMLFile
-import OFS, AccessControl
-import VersionHistory
+
+import AccessControl
+import OFS
 
 # BBB Zope 2.12
 try:
@@ -73,7 +75,7 @@ def __getitem__(self, name):
         activity = self._branches.get(name)
         if activity is not None:
             return activity.__of__(self)
-        raise KeyError, name
+        raise KeyError(name)
 
     security.declarePrivate('objectIds')
     def objectIds(self, spec=None):

src/Products/ZopeVersionControl/__init__.py

@@ -11,10 +11,11 @@
 #
 ##############################################################################
 
-import ZopeRepository
+from . import ZopeRepository
 from App.class_init import default__class_init__ as InitializeClass
 from App.ImageFile import ImageFile
 
+
 def initialize(context):
 
     context.registerClass(

src/Products/ZopeVersionControl/nonversioned.py

@@ -15,13 +15,11 @@
 $Id$
 """
 
+from .interfaces import INonVersionedData
+from .VersionSupport import isAVersionableResource
 from Acquisition import aq_base
 from OFS.ObjectManager import ObjectManager
-
-from interfaces import INonVersionedData
-from VersionSupport import isAVersionableResource
-from zope.interface import implements
-
+from zope.interface import implementer
 
 try:
     # Optional support for references.
@@ -69,10 +67,10 @@ def restoreNonVersionedData(obj, dict):
 
 
 
+@implementer(INonVersionedData)
 class StandardNonVersionedDataAdapter:
     """Non-versioned data adapter for arbitrary things.
     """
-    implements(INonVersionedData)
 
     def __init__(self, obj):
         self.obj = obj
@@ -105,10 +103,10 @@ def restoreNonVersionedData(self, data):
                 setattr(aq_base(self.obj), attr, data[attr])
 
 
+@implementer(INonVersionedData)
 class ObjectManagerNonVersionedDataAdapter(StandardNonVersionedDataAdapter):
     """Non-versioned data adapter for object managers.
     """
-    implements(INonVersionedData)
 
     def listNonVersionedObjects(self):
         contents = self.getNonVersionedData()['contents']