Changeset 149

Timestamp:

03/23/06 19:00:10 (6 years ago)

Author:

sdeibel

Message:

Updates to work w/ cpy scripts in the latest CMF. The key fix is
making sure filepath is a full path before compiling the code object.

Files:

• WingDBG/trunk/ScriptDebugging.py (modified) (5 diffs)

WingDBG/trunk/ScriptDebugging.py

@@ -15 +15 @@
 Wingware to support debugging of file system scripts running under Zope'''
 
-__version__='1.0.3'
-
-import sys, marshal
+__version__='1.0.4'
+
+import os, sys, marshal
 from zLOG import LOG, ERROR
 
@@ -23 +23 @@
 from Products.PythonScripts.PythonScript import PythonScript, Python_magic, \
     Script_magic, _nonempty_line, _first_indent, _nice_bind_names
+
+# Copy of code from CMFCore utils so we can expand the partial
+# paths used for products to full path
+import Products
+ProductsPath = [ os.path.abspath(ppath) for ppath in Products.__path__ ]
+def expandpath(p):
+    p = os.path.normpath(p)
+    if os.path.isabs(p):
+        return p
+
+    for ppath in ProductsPath:
+        abs = os.path.join(ppath, p)
+        if os.path.exists(abs):
+            return abs
+
+    # We're hosed
+    return p
 
 # Add support for storing a path to the file.
@@ -36 +53 @@
 def PythonScript_compile(self):
     
-    fp = getattr(self, '_filepath', self.meta_type)
+    fp = getattr(self, '_filepath', None)
+    if fp is not None:
+        fp = expandpath(fp)
+    else:
+        fp = self.meta_type
     bind_names = self.getBindingAssignments().getAssignedNamesInOrder()
     r = self._compiler(self._params, self._body or 'pass',
@@ -189 +210 @@
 try:
     from Products.CMFCore.FSPythonScript import FSPythonScript
-    from Products.CMFCore.DirectoryView import expandpath
 except ImportError:
     FSPythonScript = None
@@ -253 +273 @@
     if CMFPythonScript is not None:
         CMFPythonScript.write = PythonScriptwrite
-    
+        
 def unpatch():
     PythonScript.__init__ = savedPythonScript__init__