Commit 2cb4b6ce authored by Jim Fulton's avatar Jim Fulton

Changed to use new Moniker bind protocol, which requires that

we use our jar when pasting objects.
parent 986cdeca
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
# #
############################################################################## ##############################################################################
__doc__="""Copy interface""" __doc__="""Copy interface"""
__version__='$Revision: 1.40 $'[11:-2] __version__='$Revision: 1.41 $'[11:-2]
import sys, string, Globals, Moniker, tempfile, ExtensionClass import sys, string, Globals, Moniker, tempfile, ExtensionClass
from marshal import loads, dumps from marshal import loads, dumps
...@@ -194,7 +194,7 @@ class CopyContainer(ExtensionClass.Base): ...@@ -194,7 +194,7 @@ class CopyContainer(ExtensionClass.Base):
for j, d in cp[1]: for j, d in cp[1]:
m.jar=j m.jar=j
m.ids=d m.ids=d
try: ob=m.bind() try: ob=m.bind(self._p_jar)
except: raise CopyError, eNotFound except: raise CopyError, eNotFound
self._verifyObjectPaste(ob, REQUEST) self._verifyObjectPaste(ob, REQUEST)
# try: ob._notifyOfCopyTo(self, op=op) # try: ob._notifyOfCopyTo(self, op=op)
...@@ -318,7 +318,7 @@ class CopyContainer(ExtensionClass.Base): ...@@ -318,7 +318,7 @@ class CopyContainer(ExtensionClass.Base):
for j, d in cp[1]: for j, d in cp[1]:
m.jar=j m.jar=j
m.ids=d m.ids=d
oblist.append(m.bind()) oblist.append(m.bind(self._p_jar))
return oblist return oblist
validClipData=cb_dataValid validClipData=cb_dataValid
......
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