Commit 9e6e8a94 authored by 's avatar

Changed args to _verifyObjectPaste

parent ec55950b
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
############################################################################## ##############################################################################
__doc__="""Object Manager __doc__="""Object Manager
$Id: ObjectManager.py,v 1.95 2000/05/26 16:14:00 shane Exp $""" $Id: ObjectManager.py,v 1.96 2000/05/30 15:26:34 brian Exp $"""
__version__='$Revision: 1.95 $'[11:-2] __version__='$Revision: 1.96 $'[11:-2]
import App.Management, Acquisition, Globals, CopySupport, Products import App.Management, Acquisition, Globals, CopySupport, Products
import os, App.FactoryDispatcher, ts_regex, Products import os, App.FactoryDispatcher, ts_regex, Products
...@@ -506,7 +506,7 @@ class ObjectManager( ...@@ -506,7 +506,7 @@ class ObjectManager(
obj=obj.aq_parent obj=obj.aq_parent
connection=obj._p_jar connection=obj._p_jar
ob=connection.importFile(file) ob=connection.importFile(file)
if REQUEST: self._verifyObjectPaste(ob, REQUEST) if REQUEST: self._verifyObjectPaste(ob)
id=ob.id id=ob.id
if hasattr(id, 'im_func'): id=id() if hasattr(id, 'im_func'): id=id()
self._setObject(id, ob) self._setObject(id, ob)
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
"""WebDAV support - resource objects.""" """WebDAV support - resource objects."""
__version__='$Revision: 1.30 $'[11:-2] __version__='$Revision: 1.31 $'[11:-2]
import sys, os, string, mimetypes, davcmds, ExtensionClass import sys, os, string, mimetypes, davcmds, ExtensionClass
from common import absattr, aq_base, urlfix, rfc1123_date from common import absattr, aq_base, urlfix, rfc1123_date
...@@ -269,7 +269,7 @@ class Resource(ExtensionClass.Base): ...@@ -269,7 +269,7 @@ class Resource(ExtensionClass.Base):
raise 'Precondition Failed', 'Destination resource exists.' raise 'Precondition Failed', 'Destination resource exists.'
try: parent._checkId(name, allow_dup=1) try: parent._checkId(name, allow_dup=1)
except: raise 'Forbidden', sys.exc_info()[1] except: raise 'Forbidden', sys.exc_info()[1]
try: parent._verifyObjectPaste(self, REQUEST) try: parent._verifyObjectPaste(self)
except 'Unauthorized': except 'Unauthorized':
raise 'Unauthorized', sys.exc_info()[1] raise 'Unauthorized', sys.exc_info()[1]
except: raise 'Forbidden', sys.exc_info()[1] except: raise 'Forbidden', sys.exc_info()[1]
...@@ -328,7 +328,7 @@ class Resource(ExtensionClass.Base): ...@@ -328,7 +328,7 @@ class Resource(ExtensionClass.Base):
raise 'Precondition Failed', 'Resource %s exists.' % dest raise 'Precondition Failed', 'Resource %s exists.' % dest
try: parent._checkId(name, allow_dup=1) try: parent._checkId(name, allow_dup=1)
except: raise 'Forbidden', sys.exc_info()[1] except: raise 'Forbidden', sys.exc_info()[1]
try: parent._verifyObjectPaste(self, REQUEST) try: parent._verifyObjectPaste(self)
except: raise 'Forbidden', sys.exc_info()[1] except: raise 'Forbidden', sys.exc_info()[1]
ob=aq_base(self._getCopy(parent)) ob=aq_base(self._getCopy(parent))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment