Changeset 1478

Timestamp:

07/09/08 16:10:31 (2 months ago)

Author:

rob

Message:

Added bangpathModificationHook to JobControlMixin?
* scripts are not run by directly executing them any more -- the bangpath line is parsed out and used as the command line
* python mode now adds '-u' to the bang path if it doesn't exist

Location:

trunk/peppy

Files:

• major.py (modified) (3 diffs)
• plugins/python_mode.py (modified) (1 diff)

trunk/peppy/major.py

@@ -1010 +1010 @@
                                        script, self.getScriptArgs())
             else:
-                mode = os.stat(script)[stat.ST_MODE] | stat.S_IXUSR
-                os.chmod(script, mode)
-            
+                # Rather than calling the script directly, simulate how the
+                # operating system uses the bangpath by calling the bangpath
+                # program with the path to the script supplied as the argument
                 script = script.replace(' ', '\ ')
-                cmd = "%s %s" % (script, self.getScriptArgs())
+                cmd = "%s %s %s" % (bangpath, script, self.getScriptArgs())
         else:
             interpreter = self.classprefs.interpreter_exe
@@ -1027 +1027 @@
             cmd = "%s %s %s %s" % (interpreter, self.getInterpreterArgs(),
                                    script, self.getScriptArgs())
-        dprint(cmd)
+        #dprint(cmd)
         return cmd
+    
+    def bangpathModificationHook(self, path):
+        """Hook method to modify the bang path as read from the first line in
+        the script.
+        
+        Note that the passed-in string will have already had the "#!" characters
+        stripped off, so only the pathname and arguments will exist.
+        """
+        return path
         
     def startInterpreter(self, argstring=None):
@@ -1043 +1052 @@
         first = self.GetLine(0)
         if first.startswith("#!"):
-            bangpath = first[2:]
+            bangpath = self.bangpathModificationHook(first[2:].rstrip())
             
         msg = None

trunk/peppy/plugins/python_mode.py

@@ -234 +234 @@
 
     autoindent = PythonAutoindent()
+    
+    def bangpathModificationHook(self, path):
+        """Make sure the '-u' flag is included in the python argument"""
+        if '-u' not in path:
+            path += " -u"
+        self.dprint(path)
+        return path
 
     def findParagraphStart(self, linenum, info):