minors in debug console

diff --git a/python/helpers/pydev/pydev_ipython/matplotlibtools.py b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
index bb7f28d4f14bd28c6c08f79b8b1ed39314c21774..664f6ab06b33b37473267e1a1218b2c69ed59260 100644 (file)
--- a/python/helpers/pydev/pydev_ipython/matplotlibtools.py
+++ b/python/helpers/pydev/pydev_ipython/matplotlibtools.py
@@ -33,7 +33,7 @@ def do_enable_gui(guiname):
             traceback.print_exc()
     elif guiname not in ['none', '', None]:
         # Only print a warning if the guiname was going to do something
-        sys.stderr.write("PyDev console: Python version does not support GUI event loop integration for '%s'\n" % guiname)
+        sys.stderr.write("Debug console: Python version does not support GUI event loop integration for '%s'\n" % guiname)
     # Return value does not matter, so return back what was sent
     return guiname
 

diff --git a/python/helpers/pydev/pydevd.py b/python/helpers/pydev/pydevd.py
index 88b53429197781926c6e1208b69003c2a20fe809..4d8f109e8ac7831b50447d4a9b27c36614e25a7d 100644 (file)
--- a/python/helpers/pydev/pydevd.py
+++ b/python/helpers/pydev/pydevd.py
@@ -493,9 +493,7 @@ class PyDB:
             # a single operation, so we don't return True on every
             # call when the debug hook is in place to allow the GUI to run
             _DebugConsoleHelper._return_control_osc = not _DebugConsoleHelper._return_control_osc
-            if _DebugConsoleHelper._return_control_osc:
-                return True
-            return False
+            return _DebugConsoleHelper._return_control_osc
 
         from pydev_ipython.inputhook import get_inputhook, set_return_control_callback
         set_return_control_callback(return_control)