Skip to content

Commit

Permalink
Set the default monkeypatching of qt to None. Fixes #362
Browse files Browse the repository at this point in the history
  • Loading branch information
fabioz committed Nov 5, 2020
1 parent 7485e76 commit ad09acb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/debugpy/launcher/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ 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]

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

Expand Down
4 changes: 2 additions & 2 deletions src/debugpy/server/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# TODO: "gevent", if possible.
_config = {
"qt": "auto",
"qt": "none",
"subProcess": True,
"python": sys.executable,
}
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/debugpy/server/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit ad09acb

Please sign in to comment.