Stop using DONT_DEBUG.

ericsnowcurrently · ericsnowcurrently · commit fe10edb49c7d · 2019-04-03T17:05:47.000-06:00
diff --git a/pythonFiles/ptvsd_launcher.py b/pythonFiles/ptvsd_launcher.py
@@ -19,13 +19,11 @@
         sys.path.insert(0, ptvs_lib_path)
     try:
         import ptvsd
-        import ptvsd.debugger as vspd
         from ptvsd.__main__ import main
         ptvsd_loaded = True
     except ImportError:
         ptvsd_loaded = False
         raise
-    vspd.DONT_DEBUG.append(os.path.normcase(__file__))
 except:
     traceback.print_exc()
     print('''
diff --git a/pythonFiles/testlauncher.py b/pythonFiles/testlauncher.py
@@ -20,8 +20,6 @@ def exclude_current_file_from_debugger():
     # Load the debugger package
     try:
         import ptvsd
-        import ptvsd.debugger as vspd
-        vspd.DONT_DEBUG.append(os.path.normcase(__file__))
     except:
         traceback.print_exc()
         print('''
diff --git a/pythonFiles/visualstudio_py_testlauncher.py b/pythonFiles/visualstudio_py_testlauncher.py
@@ -222,7 +222,7 @@ def main():
     (opts, _) = parser.parse_args()
 
     if opts.debug:
-        from ptvsd.visualstudio_py_debugger import DONT_DEBUG, DEBUG_ENTRYPOINTS, get_code
+        from ptvsd.visualstudio_py_debugger import DEBUG_ENTRYPOINTS, get_code
 
     sys.path[0] = os.getcwd()
     if opts.result_port:
@@ -238,7 +238,7 @@ def main():
         sys.stderr = _TestOutput(sys.stderr, is_stdout = False)
 
     if opts.debug:
-        DONT_DEBUG.append(os.path.normcase(__file__))
+        # TODO: Stop using this internal API? (See #3201.)
         DEBUG_ENTRYPOINTS.add(get_code(main))
 
         pass
diff --git a/src/test/pythonFiles/folding/attach_server.py b/src/test/pythonFiles/folding/attach_server.py
@@ -83,9 +83,12 @@
 ATCH = to_bytes('ATCH')
 REPL = to_bytes('REPL')
 
+PY_ROOT = os.path.normcase(__file__)
+while os.path.basename(PY_ROOT) != 'pythonFiles':
+    PY_ROOT = os.path.dirname(PY_ROOT)
+
 _attach_enabled = False
 _attached = threading.Event()
-vspd.DONT_DEBUG.append(os.path.normcase(__file__))
 
 
 class AttachAlreadyEnabledError(Exception):
@@ -238,6 +241,10 @@ def server_thread_func():
 
                 elif response == ATCH:
                     debug_options = vspd.parse_debug_options(read_string(client))
+                    debug_options.setdefault('rules', []).append({
+                        'path': PY_ROOT,
+                        'include': False,
+                        })
                     if redirect_output:
                         debug_options.add('RedirectOutput')
 
diff --git a/src/test/pythonFiles/folding/noComments.py b/src/test/pythonFiles/folding/noComments.py
@@ -35,9 +35,12 @@
 ATCH = to_bytes('ATCH')
 REPL = to_bytes('REPL')
 
+PY_ROOT = os.path.normcase(__file__)
+while os.path.basename(PY_ROOT) != 'pythonFiles':
+    PY_ROOT = os.path.dirname(PY_ROOT)
+
 _attach_enabled = False
 _attached = threading.Event()
-vspd.DONT_DEBUG.append(os.path.normcase(__file__))
 
 
 class AttachAlreadyEnabledError(Exception):
@@ -187,6 +190,10 @@ def server_thread_func():
 
                 elif response == ATCH:
                     debug_options = vspd.parse_debug_options(read_string(client))
+                    debug_options.setdefault('rules', []).append({
+                        'path': PY_ROOT,
+                        'include': False,
+                        })
                     if redirect_output:
                         debug_options.add('RedirectOutput')
 
diff --git a/src/test/pythonFiles/folding/noDocStrings.py b/src/test/pythonFiles/folding/noDocStrings.py
@@ -83,9 +83,12 @@
 ATCH = to_bytes('ATCH')
 REPL = to_bytes('REPL')
 
+PY_ROOT = os.path.normcase(__file__)
+while os.path.basename(PY_ROOT) != 'pythonFiles':
+    PY_ROOT = os.path.dirname(PY_ROOT)
+
 _attach_enabled = False
 _attached = threading.Event()
-vspd.DONT_DEBUG.append(os.path.normcase(__file__))
 
 
 class AttachAlreadyEnabledError(Exception):
@@ -187,6 +190,10 @@ def server_thread_func():
 
                 elif response == ATCH:
                     debug_options = vspd.parse_debug_options(read_string(client))
+                    debug_options.setdefault('rules', []).append({
+                        'path': PY_ROOT,
+                        'include': False,
+                        })
                     if redirect_output:
                         debug_options.add('RedirectOutput')
 
diff --git a/src/test/pythonFiles/folding/visualstudio_py_repl.py b/src/test/pythonFiles/folding/visualstudio_py_repl.py
@@ -71,6 +71,10 @@
 
 DEBUG = os.environ.get('DEBUG_REPL') is not None
 
+PY_ROOT = os.path.normcase(__file__)
+while os.path.basename(PY_ROOT) != 'pythonFiles':
+    PY_ROOT = os.path.dirname(PY_ROOT)
+
 __all__ = ['ReplBackend', 'BasicReplBackend', 'BACKEND']
 
 def _debug_write(out):
@@ -349,6 +353,10 @@ def _cmd_debug_attach(self):
         port = read_int(self.conn)
         id = read_string(self.conn)
         debug_options = visualstudio_py_debugger.parse_debug_options(read_string(self.conn))
+        debug_options.setdefault('rules', []).append({
+            'path': PY_ROOT,
+            'include': False,
+            })
         self.attach_process(port, id, debug_options)
 
     _COMMANDS = {
@@ -380,7 +388,6 @@ def init_debugger(self):
         from os import path
         sys.path.append(path.dirname(__file__))
         import visualstudio_py_debugger
-        visualstudio_py_debugger.DONT_DEBUG.append(path.normcase(__file__))
         new_thread = visualstudio_py_debugger.new_thread()
         sys.settrace(new_thread.trace_func)
         visualstudio_py_debugger.intercept_threads(True)
