Changeset 1566

Timestamp:

Nov 10, 2014 12:52:35 PM (11 years ago)

Author:

toby

Message:

move debug invovation after parse of most routines; remove traceback formatting on windows

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIpath.py (modified) (3 diffs)

trunk/GSASII.py ¶

@@ -3620 +3620 @@
     #print "wxPython description",wx.PlatformInfo
     print "This is GSAS-II version:     ",__version__,' revision '+str(GSASIIpath.GetVersionNumber())
+    GSASIIpath.InvokeDebugOpts()
     main() # start the GUI

trunk/GSASIIpath.py ¶

@@ -309 +309 @@
     sys.exit()
 
-def IPyBreak():
+def IPyBreak_base():
     '''A routine that invokes an IPython session at the calling location
     This routine is only used when debug=True is set in config.py
@@ -339 +339 @@
     '''
     from IPython.core import ultratb
-    ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
+    if 'win' in sys.platform:
+        ultratb.FormattedTB(call_pdb=False,color_scheme='NoColor')(*args)
+    else:
+        ultratb.FormattedTB(call_pdb=False,color_scheme='LightBG')(*args)
     try: 
         from IPython.terminal.embed import InteractiveShellEmbed
@@ -362 +365 @@
     pass 
 
-if GetConfigValue('debug'):
-    print 'Debug on: IPython: Exceptions and G2path.IPyBreak(); pdb: G2path.pdbBreak()'
-    sys.excepthook = exceptHook
-    import pdb
-    pdbBreak = pdb.set_trace
-else:
-    IPyBreak = DoNothing
-    pdbBreak = DoNothing
+IPyBreak = DoNothing
+pdbBreak = DoNothing
+def InvokeDebugOpts():
+    'Called in GSASII.py to set up debug options'
+    if GetConfigValue('debug'):
+        print 'Debug on: IPython: Exceptions and G2path.IPyBreak(); pdb: G2path.pdbBreak()'
+        sys.excepthook = exceptHook
+        import pdb
+        global pdbBreak
+        pdbBreak = pdb.set_trace
+        global IPyBreak
+        IPyBreak = IPyBreak_base
     
 if __name__ == '__main__':
+    '''What follows is called to update (or downdate) GSAS-II in a separate process. 
+    '''
     import subprocess
     import time