Changeset 1790664 in sasview

Timestamp:

Aug 28, 2014 7:42:24 AM (10 years ago)

Author:

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c915053

Parents:

191c648

Message:

include exception details in sasview.log; run scripts as main

File:

• sansview/sansview.py (modified) (3 diffs)

sansview/sansview.py

@@ -58 +58 @@
         # modules. We load the fitting module here
         # to ensure a complete Windows executable build.
-        
+
         # Fitting perspective
         try:
@@ -67 +67 @@
             logging.error("Fitting problems: " + str(inst))
             logging.error("%s: could not find Fitting plug-in module"% APP_NAME) 
-            logging.error(sys.exc_value)  
-            
+            logging.error(sys.exc_value)
+
         # P(r) perspective
         try:
@@ -115 +115 @@
     freeze_support()
     if len(sys.argv) > 1:
+        ## Run sasview as an interactive python interpreter
+        #if sys.argv[1] == "-i":
+        #    sys.argv = ["ipython", "--pylab"]
+        #    from IPython import start_ipython
+        #    sys.exit(start_ipython())
         thing_to_run = sys.argv[1]
         sys.argv = sys.argv[1:]
         import runpy
         if os.path.exists(thing_to_run):
-            runpy.run_path(thing_to_run)
+            runpy.run_path(thing_to_run, run_name="__main__")
         else:
-            runpy.run_module(thing_to_run)
+            runpy.run_module(thing_to_run, run_name="__main__")
     else:
         SasView()