From 374945f0c67715132993b911445654d16bad8892 Mon Sep 17 00:00:00 2001 From: cclauss Date: Sun, 13 Jan 2019 14:21:16 +0100 Subject: [PATCH 1/2] Simplify by using six.string_types --- src/python/nimbusml/internal/utils/data_schema.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/python/nimbusml/internal/utils/data_schema.py b/src/python/nimbusml/internal/utils/data_schema.py index e99f65f4..dc844b41 100644 --- a/src/python/nimbusml/internal/utils/data_schema.py +++ b/src/python/nimbusml/internal/utils/data_schema.py @@ -610,15 +610,8 @@ def read_schema_file( df = read_csv(filepath_or_buffer, nrows=nrows, **pd_options) # We remove integers as column names. - if sys.version_info < (3, 0): - df.columns = \ - ['c' + str(_) if - (not isinstance(_, str) and not isinstance(_, unicode)) - else _ for _ in df.columns] - else: - df.columns = [ - 'c' + str(_) if not isinstance(_, str) - else _ for _ in df.columns] + df.columns = ['c' + str(_) if not isinstance(_, six.string_types) + else _ for _ in df.columns] if isinstance(pd_options.get('dtype', None), dict): # We overwrite types if specified. From 117a6ed983deaf2aa73f16685423624aee6bc0ef Mon Sep 17 00:00:00 2001 From: cclauss Date: Wed, 16 Jan 2019 12:08:48 +0100 Subject: [PATCH 2/2] Force a retest --- src/python/nimbusml/internal/utils/data_schema.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python/nimbusml/internal/utils/data_schema.py b/src/python/nimbusml/internal/utils/data_schema.py index dc844b41..60717bda 100644 --- a/src/python/nimbusml/internal/utils/data_schema.py +++ b/src/python/nimbusml/internal/utils/data_schema.py @@ -610,8 +610,8 @@ def read_schema_file( df = read_csv(filepath_or_buffer, nrows=nrows, **pd_options) # We remove integers as column names. - df.columns = ['c' + str(_) if not isinstance(_, six.string_types) - else _ for _ in df.columns] + df.columns = [_ if isinstance(_, six.string_types) + else 'c' + str(_) for _ in df.columns] if isinstance(pd_options.get('dtype', None), dict): # We overwrite types if specified.