Sync with pydevd

cgmanifest.json

@@ -24,7 +24,7 @@
     {
       "Component": {
         "Type": "pip",
-        "pip": { "Name": "pydevd", "Version": "2.1.0" }
+        "pip": { "Name": "pydevd", "Version": "2.4.1" }
       },
       "DevelopmentDependency": false
     },

src/debugpy/_vendored/pydevd/_pydev_runfiles/pydev_runfiles_nose.py

@@ -127,6 +127,8 @@ class PydevPlugin(Plugin):
                 from io import StringIO
             s = StringIO()
             etype, value, tb = err
+            if isinstance(value, str):
+                return value
             import traceback;traceback.print_exception(etype, value, tb, file=s)
             return s.getvalue()
         return err

src/debugpy/_vendored/pydevd/pydev_ipython/inputhookwx.py

@@ -114,7 +114,10 @@ def inputhook_wx3():
     try:
         app = wx.GetApp()  # @UndefinedVariable
         if app is not None:
-            assert wx.Thread_IsMain()  # @UndefinedVariable
+            if hasattr(wx, 'IsMainThread'):
+                assert wx.IsMainThread()  # @UndefinedVariable
+            else:
+                assert wx.Thread_IsMain()  # @UndefinedVariable
 
             # The import of wx on Linux sets the handler for signal.SIGINT
             # to 0.  This is a bug in wx or gtk.  We fix by just setting it