Skip to content

Commit

Permalink
Merge from 2.3: Fix for issue #2815
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Nov 18, 2015
2 parents 4a28726 + 45379de commit f7a23c6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions spyderlib/widgets/variableexplorer/namespacebrowser.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@ def is_data_frame(self, name):
def is_series(self, name):
"""Return True if variable is a Series"""
return communicate(self._get_sock(),
"isinstance(globals()['%s'], Series)" % name)
"isinstance(globals()['%s'], Series)" % name)

def get_array_shape(self, name):
"""Return array's shape"""
return communicate(self._get_sock(), "%s.shape" % name)
Expand Down
2 changes: 1 addition & 1 deletion spyderlib/widgets/variableexplorer/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def get_type_string(item):
if isinstance(item, DataFrame):
return "DataFrame"
if isinstance(item, Series):
return "Series"
return "Series"
found = re.findall(r"<(?:type|class) '(\S*)'>", str(type(item)))
if found:
return found[0]
Expand Down

0 comments on commit f7a23c6

Please sign in to comment.