pydevd-pycharm 242.24807.21__tar.gz → 243.16718.36__tar.gz

{pydevd_pycharm-242.24807.21/pydevd_pycharm.egg-info → pydevd_pycharm-243.16718.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 242.24807.21
+Version: 243.16718.36
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-243.16718.36/VERSION

@@ -0,0 +1 @@
+243.16718.36

{pydevd_pycharm-242.24807.21 → pydevd_pycharm-243.16718.36}/_pydevd_bundle/pydevd_comm.py

@@ -71,8 +71,10 @@ from _pydev_imps._pydev_saved_modules import threading
 from _pydev_imps._pydev_saved_modules import time
 from _pydev_imps._pydev_saved_modules import socket
 from socket import socket, AF_INET, SOCK_STREAM, SHUT_RD, SHUT_WR, SOL_SOCKET, SO_REUSEADDR, SHUT_RDWR, timeout
-from _pydevd_bundle.pydevd_constants import DebugInfoHolder, get_thread_id, IS_JYTHON, IS_PY2, IS_PY3K, \
-    IS_PY36_OR_GREATER, STATE_RUN, dict_keys, ASYNC_EVAL_TIMEOUT_SEC, IS_IRONPYTHON, GlobalDebuggerHolder, \
+from _pydevd_bundle.pydevd_constants import DebugInfoHolder, get_thread_id, IS_JYTHON, \
+    IS_PY2, IS_PY3K, \
+    IS_PY36_OR_GREATER, STATE_RUN, dict_keys, ASYNC_EVAL_TIMEOUT_SEC, IS_IRONPYTHON, \
+    GlobalDebuggerHolder, \
     get_global_debugger, GetGlobalDebugger, set_global_debugger, NEXT_VALUE_SEPARATOR
 from _pydev_bundle.pydev_override import overrides
 import json
@@ -96,9 +98,7 @@ from _pydevd_bundle import pydevd_vm_type
 from _pydevd_bundle.smart_step_into import find_stepping_variants
 from pydevd_file_utils import get_abs_path_real_path_and_base_from_frame, norm_file_to_client, is_real_file
 import pydevd_file_utils
-import os
 import sys
-import inspect
 import traceback
 from _pydevd_bundle.pydevd_utils import quote_smart as quote, compare_object_attrs_key, to_string, \
     get_non_pydevd_threads, is_pandas_container, is_numpy_container
@@ -148,7 +148,7 @@ from _pydevd_bundle.pydevd_comm_constants import (
 MAX_IO_MSG_SIZE = 1000  #if the io is too big, we'll not send all (could make the debugger too non-responsive)
 #this number can be changed if there's need to do so
 
-VERSION_STRING = "242.24807.21"
+VERSION_STRING = "243.16718.36"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()
@@ -422,14 +422,19 @@ def start_server(port):
         newSock, _addr = s.accept()
         pydevd_log(1, "Connection accepted")
         # closing server socket is not necessary but we don't need it
-        s.shutdown(SHUT_RDWR)
-        s.close()
+        try:
+            s.shutdown(SHUT_RDWR)
+        except:
+            pass
+        finally:
+            s.close()
         return newSock
 
     except:
         sys.stderr.write("Could not bind to port: %s\n" % (port,))
         sys.stderr.flush()
         traceback.print_exc()
+        raise
 
 #=======================================================================================================================
 # start_client

{pydevd_pycharm-242.24807.21 → pydevd_pycharm-243.16718.36}/_pydevd_bundle/pydevd_reload.py

@@ -98,16 +98,15 @@ target namespace.
 
 """
 
-import importlib.util
-import importlib.machinery
 import os
-from _pydev_bundle.pydev_imports import Exec
-from _pydevd_bundle import pydevd_dont_trace
-from _pydevd_bundle.pydevd_constants import IS_PY38_OR_GREATER
 import sys
 import traceback
 import types
 
+from _pydev_bundle.pydev_imports import Exec
+from _pydevd_bundle import pydevd_dont_trace
+from _pydevd_bundle.pydevd_constants import IS_PY38_OR_GREATER
+
 NO_DEBUG = 0
 LEVEL1 = 1
 LEVEL2 = 2
@@ -195,8 +194,73 @@ def xreload(mod):
 #=======================================================================================================================
 # Reload
 #=======================================================================================================================
-class Reload:
+def get_code3(modname, path):
+    # type: (str, str | None) -> types.CodeType | None
+
+    import importlib.util
+    import importlib.machinery
+
+    # Find the module; may raise ImportError
+    spec = importlib.util.find_spec(modname, path)
+    if spec is None:
+        raise ImportError("No module named '%s' could be found" % modname)
+
+    filename = spec.origin
+    stream = open(filename, 'r') if filename else None
+    _, ext = os.path.splitext(filename)
+    if ext in importlib.machinery.SOURCE_SUFFIXES:
+        kind = importlib.machinery.SOURCE_SUFFIXES
+    elif ext in importlib.machinery.BYTECODE_SUFFIXES:
+        kind = importlib.machinery.BYTECODE_SUFFIXES
+    elif ext in importlib.machinery.EXTENSION_SUFFIXES:
+        kind = importlib.machinery.EXTENSION_SUFFIXES
+    else:
+        kind = 'unknown'
+
+    try:
+        # Is it Python source code or byte code read from a file?
+        if kind not in (importlib.machinery.BYTECODE_SUFFIXES, importlib.machinery.SOURCE_SUFFIXES):
+            return
+        if kind == importlib.machinery.SOURCE_SUFFIXES:
+            source = stream.read()
+            code = compile(source, filename, "exec")
+        else:
+            import marshal
+            code = marshal.load(stream)
+    finally:
+        if stream:
+            stream.close()
+
+    return code
+
+
+def get_code2(modname, path):
+    # type: (str, str | None) -> types.CodeType | None
+
+    import imp
+
+    # Find the module; may raise ImportError
+    (stream, filename, (suffix, mode, kind)) = imp.find_module(modname, path)
+
+    # Turn it into a code object
+    try:
+        # Is it Python source code or byte code read from a file?
+        if kind not in (imp.PY_COMPILED, imp.PY_SOURCE):
+            return
+        if kind == imp.PY_SOURCE:
+            source = stream.read()
+            code = compile(source, filename, "exec")
+        else:
+            import marshal
+            code = marshal.load(stream)
+    finally:
+        if stream:
+            stream.close()
+
+    return code
+
 
+class Reload:
     def __init__(self, mod):
         self.mod = mod
         self.found_change = False
@@ -224,38 +288,17 @@ class Reload:
                 # Search the top-level module path
                 pkg = None
                 path = None  # Make find_module() uses the default search path
-            # Find the module; may raise ImportError
-            spec = importlib.util.find_spec(modname, path)
-            if spec is None:
-                raise ImportError("No module named '%s' could be found" % modname)
-
-            filename = spec.origin
-            stream = open(filename, 'r') if filename else None
-            _, ext = os.path.splitext(filename)
-            if ext in importlib.machinery.SOURCE_SUFFIXES:
-                kind = importlib.machinery.SOURCE_SUFFIXES
-            elif ext in importlib.machinery.BYTECODE_SUFFIXES:
-                kind = importlib.machinery.BYTECODE_SUFFIXES
-            elif ext in importlib.machinery.EXTENSION_SUFFIXES:
-                kind = importlib.machinery.EXTENSION_SUFFIXES
+
+            if sys.version_info < (3,):
+                code = get_code2(modname, path)
             else:
-                kind = 'unknown'
-
-            try:
-                # Is it Python source code or byte code read from a file?
-                if kind not in (importlib.machinery.BYTECODE_SUFFIXES, importlib.machinery.SOURCE_SUFFIXES):
-                    # Fall back to built-in reload()
-                    notify_error('Could not find source to reload (mod: %s)' % (modname,))
-                    return
-                if kind == importlib.machinery.SOURCE_SUFFIXES:
-                    source = stream.read()
-                    code = compile(source, filename, "exec")
-                else:
-                    import marshal
-                    code = marshal.load(stream)
-            finally:
-                if stream:
-                    stream.close()
+                code = get_code3(modname, path)
+
+            if not code:
+                # Fall back to built-in reload()
+                notify_error('Could not find source to reload (mod: %s)' % (modname,))
+                return
+
             # Execute the code.  We copy the module dict to a temporary; then
             # clear the module dict; then execute the new code in the module
             # dict; then swap things back and around.  This trick (due to

{pydevd_pycharm-242.24807.21 → pydevd_pycharm-243.16718.36}/_pydevd_bundle/pydevd_thrift.py

@@ -574,7 +574,7 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format):
     elif dim == -1:
         df = df[roffset: roffset + rows]
     else:
-        df.iloc[roffset: roffset + rows]
+        df = df.iloc[roffset: roffset + rows]
 
     rows = df.shape[0]
     cols = df.shape[1] if dim > 1 else 1

{pydevd_pycharm-242.24807.21 → pydevd_pycharm-243.16718.36}/_pydevd_bundle/pydevd_vars.py

@@ -776,7 +776,7 @@ def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format):
     elif dim == -1:
         df = df[roffset: roffset + rows]
     else:
-        df.iloc[roffset: roffset + rows]
+        df = df.iloc[roffset: roffset + rows]
 
     rows = df.shape[0]
     cols = df.shape[1] if dim > 1 else 1

{pydevd_pycharm-242.24807.21 → pydevd_pycharm-243.16718.36/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 242.24807.21
+Version: 243.16718.36
 Summary: PyCharm Debugger (used in PyCharm and PyDev)
 Home-page: https://github.com/JetBrains/intellij-community
 Author: JetBrains, Fabio Zadrozny and others

pydevd_pycharm-242.24807.21/VERSION

@@ -1 +0,0 @@
-242.24807.21