Skip to content

Commit

Permalink
Variable Explorer: Fix a full hang when creating DataFrames in PY2
Browse files Browse the repository at this point in the history
Fixes #2654
  • Loading branch information
ccordoba12 committed Sep 30, 2015
1 parent aac8649 commit 20e5e8c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion spyderlib/widgets/dataframeeditor.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def headerData(self, section, orientation, role=Qt.DisplayRole):
try:
header = to_text_string(self.df_header[0],
encoding='utf-8-sig')
except UnicodeDecodeError:
except:
header = to_text_string(self.df_header[0])
return to_qvariant(header)
else:
Expand Down
2 changes: 1 addition & 1 deletion spyderlib/widgets/dicteditorutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def value_to_display(value, truncate=False, trunc_len=80, minmax=False):
# Fixes Issue 2514
try:
ini_col = to_text_string(cols[0], encoding='utf-8-sig')
except UnicodeDecodeError:
except:
ini_col = to_text_string(cols[0])
cols = [ini_col] + [to_text_string(c) for c in cols[1:]]
else:
Expand Down

0 comments on commit 20e5e8c

Please sign in to comment.