From b0080f1df13402cfa245073c0e699a26fd734a52 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Fri, 8 Mar 2019 19:16:13 -0800 Subject: [PATCH 1/3] make core.config self-contained --- pandas/core/config.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pandas/core/config.py b/pandas/core/config.py index 01664fffb1e27..ac5ffd420c5ab 100644 --- a/pandas/core/config.py +++ b/pandas/core/config.py @@ -53,8 +53,10 @@ import re import warnings -import pandas.compat as compat -from pandas.compat import lmap, map, u +try: + unicode +except NameError: + unicode = str DeprecatedOption = namedtuple('DeprecatedOption', 'key msg rkey removal_ver') RegisteredOption = namedtuple('RegisteredOption', @@ -140,7 +142,7 @@ def _describe_option(pat='', _print_desc=True): if len(keys) == 0: raise OptionError('No such keys(s)') - s = u('') + s = u'' for k in keys: # filter by pat s += _build_option_description(k) @@ -634,7 +636,7 @@ def _build_option_description(k): o = _get_registered_option(k) d = _get_deprecated_option(k) - s = u('{k} ').format(k=k) + s = u'{k} '.format(k=k) if o.doc: s += '\n'.join(o.doc.strip().split('\n')) @@ -642,14 +644,14 @@ def _build_option_description(k): s += 'No description available.' if o: - s += (u('\n [default: {default}] [currently: {current}]') + s += (u'\n [default: {default}] [currently: {current}]' .format(default=o.defval, current=_get_option(k, True))) if d: - s += u('\n (Deprecated') - s += (u(', use `{rkey}` instead.') + s += u'\n (Deprecated' + s += (u', use `{rkey}` instead.' .format(rkey=d.rkey if d.rkey else '')) - s += u(')') + s += u')' s += '\n\n' return s @@ -777,8 +779,7 @@ def is_instance_factory(_type): """ if isinstance(_type, (tuple, list)): _type = tuple(_type) - from pandas.io.formats.printing import pprint_thing - type_repr = "|".join(map(pprint_thing, _type)) + type_repr = "|".join(map(str, _type)) else: type_repr = "'{typ}'".format(typ=_type) @@ -796,11 +797,11 @@ def is_one_of_factory(legal_values): legal_values = [c for c in legal_values if not callable(c)] def inner(x): - from pandas.io.formats.printing import pprint_thing as pp if x not in legal_values: if not any(c(x) for c in callables): - pp_values = pp("|".join(lmap(pp, legal_values))) + uvals = [str(lval) for lval in legal_values] + pp_values = "|".join(uvals) msg = "Value must be one of {pp_values}" if len(callables): msg += " or a callable" @@ -815,7 +816,7 @@ def inner(x): is_bool = is_type_factory(bool) is_float = is_type_factory(float) is_str = is_type_factory(str) -is_unicode = is_type_factory(compat.text_type) +is_unicode = is_type_factory(unicode) is_text = is_instance_factory((str, bytes)) From 0b2b751d9cb6c6d40d499b51bf1401707dd16117 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Sun, 17 Mar 2019 10:13:10 -0700 Subject: [PATCH 2/3] remove unnecessary compat code --- pandas/core/config.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pandas/core/config.py b/pandas/core/config.py index 1063aae918585..2eee1aaced02b 100644 --- a/pandas/core/config.py +++ b/pandas/core/config.py @@ -53,11 +53,6 @@ import re import warnings -try: - unicode -except NameError: - unicode = str - DeprecatedOption = namedtuple('DeprecatedOption', 'key msg rkey removal_ver') RegisteredOption = namedtuple('RegisteredOption', 'key defval doc validator cb') @@ -815,7 +810,6 @@ def inner(x): is_bool = is_type_factory(bool) is_float = is_type_factory(float) is_str = is_type_factory(str) -is_unicode = is_type_factory(unicode) is_text = is_instance_factory((str, bytes)) From edb758d9a8e8aa5626c2e3cd7902f272e27f2527 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Tue, 19 Mar 2019 10:35:25 -0700 Subject: [PATCH 3/3] remove unicode literals --- pandas/core/config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pandas/core/config.py b/pandas/core/config.py index 2eee1aaced02b..306311dc8ad5c 100644 --- a/pandas/core/config.py +++ b/pandas/core/config.py @@ -137,7 +137,7 @@ def _describe_option(pat='', _print_desc=True): if len(keys) == 0: raise OptionError('No such keys(s)') - s = u'' + s = '' for k in keys: # filter by pat s += _build_option_description(k) @@ -631,7 +631,7 @@ def _build_option_description(k): o = _get_registered_option(k) d = _get_deprecated_option(k) - s = u'{k} '.format(k=k) + s = '{k} '.format(k=k) if o.doc: s += '\n'.join(o.doc.strip().split('\n')) @@ -639,14 +639,14 @@ def _build_option_description(k): s += 'No description available.' if o: - s += (u'\n [default: {default}] [currently: {current}]' + s += ('\n [default: {default}] [currently: {current}]' .format(default=o.defval, current=_get_option(k, True))) if d: - s += u'\n (Deprecated' - s += (u', use `{rkey}` instead.' + s += '\n (Deprecated' + s += (', use `{rkey}` instead.' .format(rkey=d.rkey if d.rkey else '')) - s += u')' + s += ')' return s