From c6e824e253d41537958e8147bb4e8c26e3a3f520 Mon Sep 17 00:00:00 2001 From: Elizaveta Shashkova Date: Tue, 9 Jun 2020 20:47:08 +0300 Subject: [PATCH] PY-42705 DataView crashes with pandas 1.0.3 Update exception type in column type detection Signed-off-by: Elizaveta Shashkova GitOrigin-RevId: 24fa0bfcd7f0962dd2e5c969957a3aecae7a956e --- python/helpers/pydev/_pydevd_bundle/pydevd_thrift.py | 2 +- python/helpers/pydev/_pydevd_bundle/pydevd_vars.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_thrift.py b/python/helpers/pydev/_pydevd_bundle/pydevd_thrift.py index 157ca082b739..01afef81fbb6 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_thrift.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_thrift.py @@ -510,7 +510,7 @@ def dataframe_to_thrift_struct(df, name, roffset, coffset, rows, cols, format): except AttributeError: try: kind = df.dtypes[0].kind - except IndexError: + except (IndexError, KeyError): kind = "O" format = array_default_format(kind) else: diff --git a/python/helpers/pydev/_pydevd_bundle/pydevd_vars.py b/python/helpers/pydev/_pydevd_bundle/pydevd_vars.py index 5d692ba1ddf3..629c2289ddfc 100644 --- a/python/helpers/pydev/_pydevd_bundle/pydevd_vars.py +++ b/python/helpers/pydev/_pydevd_bundle/pydevd_vars.py @@ -642,7 +642,7 @@ def dataframe_to_xml(df, name, roffset, coffset, rows, cols, format): except AttributeError: try: kind = df.dtypes[0].kind - except IndexError: + except (IndexError, KeyError): kind = 'O' format = array_default_format(kind) else: