Skip to content

Commit

Permalink
BUG: fix Unicode error in get_dummies for Python 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Scorpil committed Jul 30, 2018
1 parent 5f71404 commit fd99536
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions pandas/core/reshape/reshape.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pylint: disable=E1101,E1103
# pylint: disable=W0703,W0622,W0613,W0201
from pandas.compat import range, text_type, zip
from pandas.compat import range, text_type, zip, u
from pandas import compat
from functools import partial
import itertools
Expand Down Expand Up @@ -923,11 +923,17 @@ def get_empty_Frame(data, sparse):

number_of_cols = len(levels)

py2_prefix_sep_is_unicode = isinstance(prefix_sep, text_type)
if prefix is not None:
dummy_strs = [u'{prefix}{sep}{level}' if isinstance(v, text_type)
else '{prefix}{sep}{level}' for v in levels]
dummy_cols = [dummy_str.format(prefix=prefix, sep=prefix_sep, level=v)
for dummy_str, v in zip(dummy_strs, levels)]
py2_prefix_is_unicode = isinstance(prefix, text_type)
dummy_cols = []
for level in levels:
fstr = '{prefix}{sep}{level}'
if py2_prefix_sep_is_unicode or py2_prefix_is_unicode or \
isinstance(level, text_type):
fstr = u(fstr)
dummy_cols.append(fstr.format(
prefix=prefix, sep=prefix_sep, level=level))
else:
dummy_cols = levels

Expand Down

0 comments on commit fd99536

Please sign in to comment.