Changeset 0225a3f in sasview for src/sas

Timestamp:

Sep 26, 2017 12:38:19 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

36ca21e

Parents:

d5aeaa3

Message:

add -c 'command' option to run.py; fix run.py shebang

File:

• src/sas/sasview/sasview.py (modified) (2 diffs)

src/sas/sasview/sasview.py

@@ -18 +18 @@
 import logging
 
-reload(sys)
-sys.setdefaultencoding("iso-8859-1")
+try:
+    reload(sys)
+    sys.setdefaultencoding("iso-8859-1")
+except NameError:
+    # On python 3 sys.setdefaultencoding does nothing, so pass.
+    # We know we are in python 3 at this point since reload is no longer in
+    # builtins, but instead has been moved to importlib, hence the NameError.
+    pass
 
 import sas
@@ -233 +239 @@
             import code
             code.interact(local={'exit': sys.exit})
+    elif sys.argv[1] == '-c':
+        exec(sys.argv[2])
     else:
         thing_to_run = sys.argv[1]