Updated permissions in Folder folder for the copy/paste methods and added

cvs log to Folder.py

lib/python/OFS/CopySupport.py

 __doc__="""Copy interface"""
-__version__='$Revision: 1.19 $'[11:-2]
+__version__='$Revision: 1.20 $'[11:-2]
 
 import sys, Globals, Moniker, tempfile
 from marshal import loads, dumps
@@ -297,7 +297,7 @@ def _get_id(ob, id):
     try: ob=ob.aq_base
     except: pass
     n=0
-    if id[8:]=='copy_of_':
+    if (len(id) > 8) and (id[8:]=='copy_of_'):
         n=1
     while (hasattr(ob, id)):
         id='copy%s_of_%s' % (n and n+1 or '', id)
@@ -382,6 +382,10 @@ eNotSupported=fMessageDialog(
 ############################################################################## 
 #
 # $Log: CopySupport.py,v $
+# Revision 1.20  1998/08/26 18:33:44  brian
+# Updated permissions in Folder folder for the copy/paste methods and added
+# cvs log to Folder.py
+#
 # Revision 1.19  1998/08/14 20:54:44  brian
 # Readded Find support that got overwritten somehow
 #

lib/python/OFS/Folder.py

 
 """Folder object
 
-$Id: Folder.py,v 1.52 1998/08/14 20:54:44 brian Exp $"""
+$Id: Folder.py,v 1.53 1998/08/26 18:33:44 brian Exp $"""
 
-__version__='$Revision: 1.52 $'[11:-2]
+__version__='$Revision: 1.53 $'[11:-2]
 
 
 from Globals import HTMLFile
@@ -88,7 +88,7 @@ class Folder(ObjectManager,RoleManager,DocumentHandler,
           'manage_acquiredForm','manage_acquiredPermissions',
           'manage_permissionForm','manage_roleForm'
           )),
-	('Delete objects',     ('manage_delObjects','manage_cutObject')),
+	('Delete objects',     ('manage_delObjects',)),
 	('Manage properties',
          ('manage_addProperty', 'manage_editProperties',
           'manage_delProperties', 'manage_changeProperties',)),
@@ -200,3 +200,10 @@ def subclass(c,super):
     return 0
 
 
+############################################################################## 
+#
+# $Log: Folder.py,v $
+# Revision 1.53  1998/08/26 18:33:44  brian
+# Updated permissions in Folder folder for the copy/paste methods and added
+# cvs log to Folder.py
+#