From ad09acb2c98f1cf5290a82038dd8f9593acd3ce5 Mon Sep 17 00:00:00 2001 From: Fabio Zadrozny Date: Fri, 30 Oct 2020 10:09:35 -0300 Subject: [PATCH] Set the default monkeypatching of qt to None. Fixes #362 --- src/debugpy/launcher/handlers.py | 4 ++-- src/debugpy/server/api.py | 4 ++-- src/debugpy/server/cli.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/debugpy/launcher/handlers.py b/src/debugpy/launcher/handlers.py index 26aaf39c9..da12ed077 100644 --- a/src/debugpy/launcher/handlers.py +++ b/src/debugpy/launcher/handlers.py @@ -56,7 +56,7 @@ def property_or_debug_option(prop_name, flag_name): qt_mode = request( "qt", json.enum( - "auto", "none", "pyside", "pyside2", "pyqt4", "pyqt5", optional=True + "none", "auto", "pyside", "pyside2", "pyqt4", "pyqt5", optional=True ), ) cmdline += ["--configure-qt", qt_mode] @@ -64,7 +64,7 @@ def property_or_debug_option(prop_name, flag_name): adapter_access_token = request("adapterAccessToken", unicode, optional=True) if adapter_access_token != (): cmdline += ["--adapter-access-token", compat.filename(adapter_access_token)] - + debugpy_args = request("debugpyArgs", json.array(unicode)) cmdline += debugpy_args diff --git a/src/debugpy/server/api.py b/src/debugpy/server/api.py index 42ffce33b..d86813281 100644 --- a/src/debugpy/server/api.py +++ b/src/debugpy/server/api.py @@ -23,7 +23,7 @@ # TODO: "gevent", if possible. _config = { - "qt": "auto", + "qt": "none", "subProcess": True, "python": sys.executable, } @@ -124,7 +124,7 @@ def debug(address, **kwargs): log.debug("{0}({1!r}, **{2!r})", func.__name__, address, kwargs) log.info("Initial debug configuration: {0!j}", _config) - qt_mode = _config.get("qt", "auto") + qt_mode = _config.get("qt", "none") if qt_mode != "none": pydevd.enable_qt_support(qt_mode) diff --git a/src/debugpy/server/cli.py b/src/debugpy/server/cli.py index 1e1df2102..3b40ff5fd 100644 --- a/src/debugpy/server/cli.py +++ b/src/debugpy/server/cli.py @@ -50,7 +50,7 @@ class Options(object): options = Options() -options.config = {"qt": "auto", "subProcess": True} +options.config = {"qt": "none", "subProcess": True} def in_range(parser, start, stop):