[Zope-Checkins] CVS: Zope/lib/python/Products/PythonScripts - PythonScript.py:1.43.4.1 standard.py:1.10.4.6

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/PythonScripts
In directory cvs.zope.org:/tmp/cvs-serv31373/lib/python/Products/PythonScripts

Modified Files:
      Tag: chrism-install-branch
	PythonScript.py standard.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/Products/PythonScripts/PythonScript.py 1.43 => 1.43.4.1 ===
--- Zope/lib/python/Products/PythonScripts/PythonScript.py:1.43	Wed Aug 14 18:25:08 2002
+++ Zope/lib/python/Products/PythonScripts/PythonScript.py	Sat Oct 26 15:51:43 2002
@@ -413,9 +413,9 @@
             if body != self._body:
                 self._body = body
             if bup:
-                self._setupBindings(bindmap)
-
-            self._makeFunction()
+                self.ZBindings_edit(bindmap)
+            else:
+                self._makeFunction()
         except:
             LOG(self.meta_type, ERROR, 'write failed', error=sys.exc_info())
             raise


=== Zope/lib/python/Products/PythonScripts/standard.py 1.10.4.5 => 1.10.4.6 ===