[Checkins] SVN: Products.ZopeVersionControl/trunk/ Made compatible with Zope 2.13 and ZODB 3.10.
Hanno Schlichting
hannosch at hannosch.eu
Wed Aug 4 15:58:39 EDT 2010
Log message for revision 115443:
Made compatible with Zope 2.13 and ZODB 3.10.
Changed:
U Products.ZopeVersionControl/trunk/CHANGES.txt
U Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py
U Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.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
-=-
Modified: Products.ZopeVersionControl/trunk/CHANGES.txt
===================================================================
--- Products.ZopeVersionControl/trunk/CHANGES.txt 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/CHANGES.txt 2010-08-04 19:58:38 UTC (rev 115443)
@@ -4,6 +4,7 @@
1.1.1 - unreleased
------------------
+- Made compatible with Zope 2.13 and ZODB 3.10.
1.1 - 2010-07-18
----------------
Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/EventLog.py 2010-08-04 19:58:38 UTC (rev 115443)
@@ -16,9 +16,11 @@
from AccessControl import ClassSecurityInfo
from BTrees.IOBTree import IOBTree
from Utility import _findUserId
-import sys, time
+import time
+MAX32 = 2**31 - 1
+
class EventLog(Persistent):
"""An EventLog encapsulates a collection of log entries."""
@@ -33,7 +35,7 @@
if len(self._data):
key = self._data.minKey() - 1
else:
- key = sys.maxint
+ key = MAX32
self._data[key] = entry
security.declarePrivate('getEntries')
Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/VersionHistory.py 2010-08-04 19:58:38 UTC (rev 115443)
@@ -23,9 +23,11 @@
from BTrees.IIBTree import IIBTree
from BTrees.OOBTree import OOBTree
from Acquisition import Implicit
-import sys, time
+import time
+MAX32 = 2**31 - 1
+
class VersionHistory(Implicit, Persistent):
"""A version history maintains the information about the changes
to a particular version-controlled resource over time."""
@@ -39,7 +41,7 @@
self._versions = OOBTree()
self._branches = OOBTree()
self._labels = OOBTree()
- mainline = self.createBranch('mainline', None)
+ self.createBranch('mainline', None)
self.id = history_id
security = ClassSecurityInfo()
@@ -246,7 +248,8 @@
version to support ordering and date lookups."""
if len(self.m_order):
key = self.m_order.minKey() - 1
- else: key = sys.maxint
+ else:
+ key = MAX32
self.m_order[key] = version.id
timestamp = int(version.date_created / 60.0)
self.m_date[timestamp] = key
Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeRepository.py 2010-08-04 19:58:38 UTC (rev 115443)
@@ -11,19 +11,24 @@
#
##############################################################################
-__version__='$Revision: 1.5 $'[11:-2]
-
from App.class_init import default__class_init__ as InitializeClass
from App.special_dtml import DTMLFile
from SequenceWrapper import SequenceWrapper
-import OFS, AccessControl
+import AccessControl
+import OFS
import Repository
+# BBB Zope 2.12
+try:
+ from OFS.role import RoleManager
+except ImportError:
+ from AccessControl.Role import RoleManager
+
class ZopeRepository(
Repository.Repository,
- AccessControl.Role.RoleManager,
- OFS.SimpleItem.Item,
+ RoleManager,
+ OFS.SimpleItem.Item
):
"""The ZopeRepository class builds on the core Repository implementation
to provide the Zope management interface and other product trappings."""
@@ -38,7 +43,7 @@
{'label': 'Properties', 'action':'manage_properties_form',
'help': ('ZopeVersionControl', 'Repository-Properties.stx')},
) +
- AccessControl.Role.RoleManager.manage_options +
+ RoleManager.manage_options +
OFS.SimpleItem.Item.manage_options
)
Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersion.py 2010-08-04 19:58:38 UTC (rev 115443)
@@ -11,19 +11,19 @@
#
##############################################################################
-__version__='$Revision: 1.6 $'[11:-2]
-
from App.class_init import default__class_init__ as InitializeClass
from App.special_dtml import DTMLFile
import OFS, AccessControl
import Version
+# BBB Zope 2.12
+try:
+ from OFS.role import RoleManager
+except ImportError:
+ from AccessControl.Role import RoleManager
-class ZopeVersion(
- Version.Version,
- AccessControl.Role.RoleManager,
- OFS.SimpleItem.Item
- ):
+
+class ZopeVersion(Version.Version, RoleManager, OFS.SimpleItem.Item):
"""The ZopeVersion class builds on the core Version class to provide
the Zope management interface and other product trappings."""
@@ -38,7 +38,7 @@
{'label': 'Properties', 'action':'manage_properties_form',
'help': ('ZopeVersionControl', 'Version-Properties.stx')},
) +
- AccessControl.Role.RoleManager.manage_options +
+ RoleManager.manage_options +
OFS.SimpleItem.Item.manage_options
)
Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/ZopeVersionHistory.py 2010-08-04 19:58:38 UTC (rev 115443)
@@ -11,16 +11,21 @@
#
##############################################################################
-__version__='$Revision: 1.2 $'[11:-2]
-
from App.class_init import default__class_init__ as InitializeClass
from App.special_dtml import DTMLFile
-import OFS, AccessControl, Acquisition
+import OFS, AccessControl
import VersionHistory
+# BBB Zope 2.12
+try:
+ from OFS.role import RoleManager
+except ImportError:
+ from AccessControl.Role import RoleManager
+
+
class ZopeVersionHistory(
VersionHistory.VersionHistory,
- AccessControl.Role.RoleManager,
+ RoleManager,
OFS.SimpleItem.Item,
):
"""The ZopeVersionHistory build on the core VersionHistory class to
@@ -37,7 +42,7 @@
{'label': 'Properties', 'action':'manage_properties_form',
'help': ('ZopeVersionControl', 'VersionHistory-Properties.stx')},
) +
- AccessControl.Role.RoleManager.manage_options +
+ RoleManager.manage_options +
OFS.SimpleItem.Item.manage_options
)
Modified: Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py
===================================================================
--- Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py 2010-08-04 19:14:19 UTC (rev 115442)
+++ Products.ZopeVersionControl/trunk/Products/ZopeVersionControl/__init__.py 2010-08-04 19:58:38 UTC (rev 115443)
@@ -11,9 +11,7 @@
#
##############################################################################
-__version__='$Revision: 1.4 $'[11:-2]
-
-import ZopeRepository, OFS
+import ZopeRepository
from App.class_init import default__class_init__ as InitializeClass
from App.ImageFile import ImageFile
@@ -66,6 +64,7 @@
def registerIcon(filename):
- setattr(OFS.misc_.misc_.ZopeVersionControl, filename,
+ from OFS import misc_
+ setattr(misc_.misc_.ZopeVersionControl, filename,
ImageFile('www/%s' % filename, globals())
)
More information about the checkins
mailing list