Changeset 5046

Timestamp:

Oct 9, 2021 11:54:26 AM (2 years ago)

Author:

toby

Message:

suppress breakpoint() unless inside spyder or debug mode is set; divert breakpoint to IPyBreak

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpath.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -417 +417 @@
                                  'matplotlib': ['3.1','3.2']}
 'versions of modules that are known to have bugs'
-versionDict['tooNewWarn'] = {'wx':'4.1'}
-#'matplotlib': '3.4', 
-'module versions newer than what we have tested where problems are suspected'
+versionDict['tooNewWarn'] = {'wx':'4.2'}
+'module versions newer than what we have tested & where problems are suspected'
 
 def ShowVersions():

trunk/GSASIIpath.py

@@ -976 +976 @@
 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()')
-        import pdb
-        global pdbBreak
-        pdbBreak = pdb.set_trace
+    if any('SPYDER' in name for name in os.environ):
+        print('Running from Spyder, keeping breakpoint() active & skipping exception trapping')
+    elif GetConfigValue('debug'):
         try:
+            import pdb
+            global pdbBreak
+            pdbBreak = pdb.set_trace
             import IPython
             global IPyBreak
             IPyBreak = IPyBreak_base
-            if any('SPYDER' in name for name in os.environ):
-                print('Running from Spyder, skipping exception trapping')
-            else:
-                sys.excepthook = exceptHook
+            sys.excepthook = exceptHook
+            os.environ['PYTHONBREAKPOINT'] = 'GSASIIpath.IPyBreak_base'
+            print ('Debug on: IPython: Exceptions and G2path.IPyBreak(); pdb: G2path.pdbBreak()')
         except:
-            pass
+            print ('Debug on failed. IPython not installed?')
+    else: # not in spyder or debug enabled, hide breakpoints
+        os.environ['PYTHONBREAKPOINT'] = '0'
 
 def TestSPG(fpth):