[Zope-Checkins] CVS: Zope/lib/python/App - Common.py:1.15.4.6 Undo.py:1.31.4.2

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	Common.py Undo.py 
Log Message:
More merges from HEAD.


=== Zope/lib/python/App/Common.py 1.15.4.5 => 1.15.4.6 ===


=== Zope/lib/python/App/Undo.py 1.31.4.1 => 1.31.4.2 ===
--- Zope/lib/python/App/Undo.py:1.31.4.1	Tue Oct  8 14:41:05 2002
+++ Zope/lib/python/App/Undo.py	Tue Oct  8 17:45:45 2002
@@ -10,16 +10,17 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-__doc__='''short description
-
-$Id$'''
+"""
+$Id$"""
 __version__='$Revision$'[11:-2]
 
-import Globals, ExtensionClass
-from DateTime import DateTime
-from AccessControl import getSecurityManager
 import base64
 
+from AccessControl import getSecurityManager
+from DateTime import DateTime
+import Globals, ExtensionClass
+from ZopeUndo.Prefix import Prefix
+
 class UndoSupport(ExtensionClass.Base):
 
     __ac_permissions__=(
@@ -126,21 +127,6 @@
         return ''
 
 Globals.default__class_init__(UndoSupport)
-
-
-class Prefix:
-
-    __no_side_effects__=1
-
-    def __init__(self, path):
-        self.value = len(path), path
-
-    def __cmp__(self, o):
-        l,v = self.value
-        rval = cmp(o[:l],v)
-        return rval
-
-
 
 ########################################################################
 # Blech, need this cause binascii.b2a_base64 is too pickly