[Checkins] SVN: zope.app.versioncontrol/trunk/src/zope/app/versioncontrol/repository.py Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

Lorenzo Gil lgs at sicem.biz
Sun Apr 27 06:58:12 EDT 2008


Log message for revision 85783:
  Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

Changed:
  U   zope.app.versioncontrol/trunk/src/zope/app/versioncontrol/repository.py

-=-
Modified: zope.app.versioncontrol/trunk/src/zope/app/versioncontrol/repository.py
===================================================================
--- zope.app.versioncontrol/trunk/src/zope/app/versioncontrol/repository.py	2008-04-27 10:45:12 UTC (rev 85782)
+++ zope.app.versioncontrol/trunk/src/zope/app/versioncontrol/repository.py	2008-04-27 10:58:11 UTC (rev 85783)
@@ -27,8 +27,8 @@
 import zope.interface
 import zope.datetime
 from zope.annotation.interfaces import IAnnotations
+from zope.traversing.api import getPath
 
-from zope.app import zapi
 from zope.app.versioncontrol import nonversioned, utility, event
 from zope.app.versioncontrol.history import VersionHistory
 from zope.app.versioncontrol.interfaces import VersionControlError
@@ -188,7 +188,7 @@
         # Save an audit record of the action being performed.
         history.addLogEntry(version_id,
                             ACTION_CHECKIN,
-                            zapi.getPath(object),
+                            getPath(object),
                             message is None and 'Initial checkin.' or message
                             )
 
@@ -214,7 +214,7 @@
                 )
 
         history = self.getVersionHistory(info.history_id)
-        ob_path = zapi.getPath(object)
+        ob_path = getPath(object)
 
         # Save an audit record of the action being performed.
         history.addLogEntry(info.version_id,
@@ -249,7 +249,7 @@
                 )
 
         history = self.getVersionHistory(info.history_id)
-        ob_path = zapi.getPath(object)
+        ob_path = getPath(object)
 
         branch = 'mainline'
         if info.sticky is not None and info.sticky[0] == 'B':
@@ -280,7 +280,7 @@
                 )
 
         history = self.getVersionHistory(info.history_id)
-        ob_path = zapi.getPath(object)
+        ob_path = getPath(object)
 
         version = history.getVersionById(info.version_id)
 
@@ -370,10 +370,7 @@
             self.replaceState(object, version.copyState())
             declare_checked_in(object)
 
-            history.addLogEntry(version_id,
-                                ACTION_UPDATE,
-                                zapi.getPath(object)
-                                )
+            history.addLogEntry(version_id, ACTION_UPDATE, getPath(object))
 
         # Update bookkeeping information.
         info = utility.VersionInfo(info.history_id, version_id, CHECKED_IN)



More information about the Checkins mailing list