s/task.py/console.py/

samizdatco · samizdatco · commit 8bb010e193c6 · 2014-06-17T01:50:48.000-04:00
diff --git a/PlotDevice.xcodeproj/project.pbxproj b/PlotDevice.xcodeproj/project.pbxproj
@@ -28,7 +28,7 @@
 		2A15C45618A48770006BDFF0 /* autocomplete.css in Copy web ui assets */ = {isa = PBXBuildFile; fileRef = 2A15C45418A48765006BDFF0 /* autocomplete.css */; };
 		2A26314B188E1A3A000B792A /* doc in Resources */ = {isa = PBXBuildFile; fileRef = 2A26314A188E1A3A000B792A /* doc */; };
 		2A294461185E54F600E9F650 /* export.py in Copy plotdevice.run */ = {isa = PBXBuildFile; fileRef = 2A294459185E539400E9F650 /* export.py */; };
-		2A294462185E54F900E9F650 /* task.py in Copy plotdevice.run */ = {isa = PBXBuildFile; fileRef = 2A29445A185E539400E9F650 /* task.py */; };
+		2A294462185E54F900E9F650 /* console.py in Copy plotdevice.run */ = {isa = PBXBuildFile; fileRef = 2A29445A185E539400E9F650 /* console.py */; };
 		2A294463185E550400E9F650 /* __init__.py in Copy plotdevice.run */ = {isa = PBXBuildFile; fileRef = 2A294458185E539400E9F650 /* __init__.py */; };
 		2A294474185E578300E9F650 /* __init__.py in Copy plotdevice.gui */ = {isa = PBXBuildFile; fileRef = 2A294464185E575F00E9F650 /* __init__.py */; };
 		2A294477185E578300E9F650 /* document.py in Copy plotdevice.gui */ = {isa = PBXBuildFile; fileRef = 2A294467185E575F00E9F650 /* document.py */; };
@@ -125,7 +125,7 @@
 			files = (
 				2A294463185E550400E9F650 /* __init__.py in Copy plotdevice.run */,
 				2AC5188118636CAF007FB066 /* sandbox.py in Copy plotdevice.run */,
-				2A294462185E54F900E9F650 /* task.py in Copy plotdevice.run */,
+				2A294462185E54F900E9F650 /* console.py in Copy plotdevice.run */,
 				2A294461185E54F600E9F650 /* export.py in Copy plotdevice.run */,
 			);
 			name = "Copy plotdevice.run";
@@ -246,7 +246,7 @@
 		2A26314A188E1A3A000B792A /* doc */ = {isa = PBXFileReference; lastKnownFileType = folder; path = doc; sourceTree = "<group>"; };
 		2A294458185E539400E9F650 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
 		2A294459185E539400E9F650 /* export.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = export.py; sourceTree = "<group>"; };
-		2A29445A185E539400E9F650 /* task.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = task.py; sourceTree = "<group>"; };
+		2A29445A185E539400E9F650 /* console.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = console.py; sourceTree = "<group>"; };
 		2A294464185E575F00E9F650 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
 		2A294467185E575F00E9F650 /* document.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = document.py; sourceTree = "<group>"; };
 		2A294468185E575F00E9F650 /* preferences.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = preferences.py; sourceTree = "<group>"; };
@@ -290,7 +290,6 @@
 		2AD0A9B6186E552700D1F6DE /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlotDeviceScript.xib; sourceTree = "<group>"; };
 		2AE5AD291862366300CCDD45 /* editor.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = editor.py; sourceTree = "<group>"; };
 		2AE5AD2C1862386400CCDD45 /* widgets.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = widgets.py; sourceTree = "<group>"; };
-		2AE5AD7E186249E100CCDD45 /* listener.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = listener.py; sourceTree = "<group>"; };
 		2AEE843A18B3285600CF91D4 /* foundry.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = foundry.py; sourceTree = "<group>"; };
 		2AEE843D18B5603900CF91D4 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		2AEE846318BEC25B00CF91D4 /* iglob.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = iglob.py; sourceTree = "<group>"; };
@@ -378,8 +377,7 @@
 				2A294458185E539400E9F650 /* __init__.py */,
 				2AC5187F18636C9F007FB066 /* sandbox.py */,
 				2A294459185E539400E9F650 /* export.py */,
-				2A29445A185E539400E9F650 /* task.py */,
-				2AE5AD7E186249E100CCDD45 /* listener.py */,
+				2A29445A185E539400E9F650 /* console.py */,
 			);
 			path = run;
 			sourceTree = "<group>";
diff --git a/etc/plotdevice b/etc/plotdevice
@@ -144,25 +144,25 @@ def module_path():
   raise ImportError
 
 def invocation():
-  """Find the path of task.py within the plotdevice module and update PYTHONPATH if needed"""
+  """Find the path of console.py within the plotdevice module and update PYTHONPATH if needed"""
   script_path = None
   py_path = filter(None, os.getenv('PYTHONPATH','').split(':')) # BUG: should it be unfiltered?
 
   try:
     # running from a virtualenv
     module = module_path()
-    script_path = join(module, 'run/task.py')
+    script_path = join(module, 'run/console.py')
     py_path.append(dirname(module)) # append the site-packages dir
   except ImportError:
     if app_path():
       # running from the app bundle
       dist_path = join(app_path(), 'Contents/Resources/python')
-      script_path = join(dist_path, 'plotdevice/run/task.py')
+      script_path = join(dist_path, 'plotdevice/run/console.py')
       py_path.append(dist_path) # append the site-packages dir
     else:
       # running from the source dist
       dist_path = abspath('%s/..'%dirname(__file__))
-      script_path = "%s/plotdevice/run/task.py"%dist_path
+      script_path = "%s/plotdevice/run/console.py"%dist_path
       py_path.append(dist_path) # add the plotdevice dir to the path
       py_path.append('%s/build/lib.macosx-10.9-intel-2.7'%dist_path) # add the .so files
 
diff --git a/plotdevice/__init__.py b/plotdevice/__init__.py
@@ -7,10 +7,10 @@ def get_version():
 class DeviceError(Exception):
     pass
 
-# note whether the module is being used within the .app, via task.py, or from the repl
+# note whether the module is being used within the .app, via console.py, or from the repl
 import sys, re
 called_from = getattr(sys.modules['__main__'], '__file__', '<interactive>')
-is_windowed = bool(re.search(r'plotdevice(-app|/run/task)\.py$', called_from))
+is_windowed = bool(re.search(r'plotdevice(-app|/run/console)\.py$', called_from))
 app = bool(called_from=='plotdevice-app.py') if is_windowed else None
 
 # add the Extras directory to sys.path since every module depends on PyObjC and friends
diff --git a/plotdevice/gui/document.py b/plotdevice/gui/document.py
@@ -186,7 +186,7 @@ def awakeFromNib(self):
         win.contentView().superview().addSubview_(self.statusView)
         self.statusView.setFrame_( ((frame.size.width-24,frame.size.height-22), (22,22)) )
 
-        # sign up for autoresume on quit-and-relaunch (but only if this isn't task.py)
+        # sign up for autoresume on quit-and-relaunch (but only if this isn't console.py)
         if self.editorView:
             win.setRestorable_(True)
 
@@ -196,7 +196,7 @@ def awakeFromNib(self):
     ## WindowController duties
 
     def windowDidLoad(self):
-        # the editor might not exist if we're being opened in task.py
+        # the editor might not exist if we're being opened in console.py
         if self.editorView:
             # pass the editor a reference to the undomanager so it can sync up with the
             # menus and the file's dirty-state
@@ -507,7 +507,7 @@ def exportProgress(self, written, total, cancelled):
         """Update the progress meter in the StatusView (invoked by self.vm.session)"""
 
         # everything in this method talks to gui objects.
-        # if we're running in task.py, there's nothing to do
+        # if we're running in console.py, there's nothing to do
         if not self.window():
             return
 
diff --git a/plotdevice/run/console.py b/plotdevice/run/console.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # encoding: utf-8
 """
-task.py
+console.py
 
-Simple renderer for command line scripts when run from the module rather than an app bundle.
+Simple renderer for `.pv' scripts when run from the console rather than in-app.
 
 This is the back-end of the `plotdevice` command line script in the 'etc' subdir of the source
 distribution (or the bin directory of your virtualenv once installed). It expects the parsed args
diff --git a/setup.py b/setup.py
@@ -252,7 +252,7 @@ def run(self):
             self.copy_file("%s/etc/plotdevice"%TOP, BIN)
 
             # put the module and .so files in a known location (primarily so the
-            # tool can find task.py)
+            # tool can find console.py)
             self.copy_tree('%s/plotdevice'%TOP, '%s/python/plotdevice'%RSRC)
             # self.copy_tree('%s/lib/python2.7/lib-dynload'%RSRC, '%s/python/plotdevice/ext'%RSRC)
             self.spawn(['/usr/bin/ditto', '%s/build/ext'%TOP, '%s/python/plotdevice/lib'%RSRC])
