From fd99536583ceeb92891c8969b44dea2b81d38bd6 Mon Sep 17 00:00:00 2001 From: Scorpil Date: Mon, 30 Jul 2018 17:52:34 +0200 Subject: [PATCH] BUG: fix Unicode error in get_dummies for Python 2 --- pandas/core/reshape/reshape.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pandas/core/reshape/reshape.py b/pandas/core/reshape/reshape.py index f9ab813855f470..6765c1bea40524 100644 --- a/pandas/core/reshape/reshape.py +++ b/pandas/core/reshape/reshape.py @@ -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 @@ -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