pydevd-pycharm 242.22855.92__tar.gz → 242.23726.20__tar.gz

{pydevd_pycharm-242.22855.92/pydevd_pycharm.egg-info → pydevd_pycharm-242.23726.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 242.22855.92
+Version: 242.23726.20
 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.23726.20/VERSION

@@ -0,0 +1 @@
+242.23726.20

{pydevd_pycharm-242.22855.92 → pydevd_pycharm-242.23726.20}/_pydevd_bundle/pydevd_comm.py

@@ -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.22855.92"
+VERSION_STRING = "242.23726.20"
 
 from _pydev_bundle._pydev_filesystem_encoding import getfilesystemencoding
 file_system_encoding = getfilesystemencoding()

{pydevd_pycharm-242.22855.92 → pydevd_pycharm-242.23726.20}/_pydevd_bundle/pydevd_repr_utils.py

@@ -40,8 +40,12 @@ def _get_df_variable_repr(data_frame):
     # large data frames. df.__str__() is already optimised and works fast enough.
     data_preview = []
     column_row = 0
-
-    rows = str(data_frame).split('\n')
+    shape_rows, shape_cols = data_frame.shape
+    if shape_cols > 1000 or shape_rows > 10000:
+        head_number = 1
+    else:
+        head_number = 3
+    rows = str(data_frame.head(head_number)).split('\n')
     for (i, r) in enumerate(rows):
         if i != column_row:
             data_preview.append("[%s]" % r)
@@ -51,7 +55,7 @@ def _get_df_variable_repr(data_frame):
 
     # The string provided is used for column name completion
     # by JupyterVarsFrameExecutor.parseFrameVars
-    return '{} {}'.format(list(data_frame.columns), ' '.join(data_preview))
+    return '%s %s' % (list(data_frame.columns), ' '.join(data_preview))
 
 
 def _trim_string_repr_if_needed(value, do_trim=True, max_length=MAX_REPR_LENGTH):
@@ -67,9 +71,9 @@ def _get_external_collection_repr(collection, raise_exception=False):
 
     # pandas var
     try:
-        if typename == "Series":
+        if typename == "Series" or typename == "GeoSeries":
             return _get_series_variable_repr(collection)
-        if typename == "DataFrame":
+        if typename == "DataFrame" or typename == "GeoDataFrame":
             return _get_df_variable_repr(collection)
     except Exception as e:
         pydev_log.warn("Failed to format pandas variable: " + str(e))

{pydevd_pycharm-242.22855.92 → pydevd_pycharm-242.23726.20}/_pydevd_bundle/pydevd_thrift.py

@@ -541,7 +541,8 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format):
         r = min(num_rows, DATAFRAME_HEADER_LOAD_MAX_SIZE)
         c = min(num_cols, DATAFRAME_HEADER_LOAD_MAX_SIZE)
         array_chunk.headers = header_data_to_thrift_struct(r, c, [""] * num_cols, [(0, 0)] * num_cols, lambda x: DEFAULT_DF_FORMAT, original_df, dim)
-        array_chunk.data = array_data_to_thrift_struct(rows, cols, None, format)
+
+        array_chunk.data = array_data_to_thrift_struct(rows, cols, None, '%' + format)
         return array_chunk
 
     rows = min(rows, MAXIMUM_ARRAY_SIZE)
@@ -592,7 +593,8 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format):
         return get_formatted_row_elements(row, iat, dim, cols, format, dtypes)
 
     array_chunk.headers = header_data_to_thrift_struct(rows, cols, dtypes, col_bounds, col_to_format, df, dim)
-    array_chunk.data = array_data_to_thrift_struct(rows, cols, formatted_row_elements, format)
+    # we already have here formatted_row_elements, so we pass here %s as a default format
+    array_chunk.data = array_data_to_thrift_struct(rows, cols, formatted_row_elements, format='%s')
     return array_chunk
 
 

{pydevd_pycharm-242.22855.92 → pydevd_pycharm-242.23726.20}/_pydevd_bundle/pydevd_vars.py

@@ -796,7 +796,8 @@ def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format):
 
     xml += header_data_to_xml(rows, cols, dtypes, col_bounds, col_to_format, df, dim)
 
-    xml += array_data_to_xml(rows, cols, formatted_row_elements, format)
+    # we already have here formatted_row_elements, so we pass here %s as a default format
+    xml += array_data_to_xml(rows, cols, formatted_row_elements, format='%s')
     return xml
 
 def dataset_to_xml(dataset, name, roffset, coffset, rows, cols, format):

{pydevd_pycharm-242.22855.92 → pydevd_pycharm-242.23726.20/pydevd_pycharm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pydevd-pycharm
-Version: 242.22855.92
+Version: 242.23726.20
 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.22855.92/VERSION

@@ -1 +0,0 @@
-242.22855.92