From 182c68bf57d85950b78598745d959c22933bde7a Mon Sep 17 00:00:00 2001 From: jvpy Date: Wed, 4 Dec 2019 19:10:44 -0300 Subject: [PATCH 01/14] #29886 - Replace rm -rf pandas/ for repr() on parses.py --- pandas/io/parsers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 7403e6d254d03..24343d7b28680 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -913,8 +913,8 @@ def _get_options_with_defaults(self, engine): pass else: raise ValueError( - "The %r option is not supported with the" - " %r engine" % (argname, engine) + f"The {repr(argname)} option is not supported with the" + f" {repr(engine)} engine" ) else: value = _deprecated_defaults.get(argname, default) @@ -3607,8 +3607,8 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 if not isinstance(self.colspecs, (tuple, list)): raise TypeError( - "column specifications must be a list or tuple, " - "input was a %r" % type(colspecs).__name__ + f"column specifications must be a list or tuple, " + f"input was a {repr(type(colspecs).__name__)}" ) for colspec in self.colspecs: From 029ee4dbfff5362bfe7d21e140d0e22517a0a068 Mon Sep 17 00:00:00 2001 From: jvpy Date: Wed, 4 Dec 2019 21:41:07 -0300 Subject: [PATCH 02/14] STY - Add repr to html.py and parsers.py - #29953 --- pandas/io/html.py | 4 ++-- pandas/io/parsers.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index b8cb6679a9562..ff401ee539aa9 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -103,7 +103,7 @@ def _get_skiprows(skiprows): elif skiprows is None: return 0 raise TypeError( - "%r is not a valid type for skipping rows" % type(skiprows).__name__ + f"{repr(type(skiprows).__name__)} is not a valid type for skipping rows" ) @@ -133,7 +133,7 @@ def _read(obj): except (TypeError, ValueError): pass else: - raise TypeError("Cannot read object of type %r" % type(obj).__name__) + raise TypeError(f"Cannot read object of type {type(obj).__name__}") return text diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 24343d7b28680..961c37ca811df 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -3600,7 +3600,7 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 self.comment = comment if colspecs == "infer": self.colspecs = self.detect_colspecs( - infer_nrows=infer_nrows, skiprows=skiprows + infer_nrows=infer_nrows, skiprows=skiprow ) else: self.colspecs = colspecs From 4ea03fc7cafb9bee72368e3ed1e5ef12efa40020 Mon Sep 17 00:00:00 2001 From: jvpy Date: Wed, 4 Dec 2019 21:47:29 -0300 Subject: [PATCH 03/14] STY - Add repr to html.py and parsers.py - #29953 --- pandas/io/html.py | 4 ++-- pandas/io/parsers.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index b8cb6679a9562..ff401ee539aa9 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -103,7 +103,7 @@ def _get_skiprows(skiprows): elif skiprows is None: return 0 raise TypeError( - "%r is not a valid type for skipping rows" % type(skiprows).__name__ + f"{repr(type(skiprows).__name__)} is not a valid type for skipping rows" ) @@ -133,7 +133,7 @@ def _read(obj): except (TypeError, ValueError): pass else: - raise TypeError("Cannot read object of type %r" % type(obj).__name__) + raise TypeError(f"Cannot read object of type {type(obj).__name__}") return text diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 7403e6d254d03..24343d7b28680 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -913,8 +913,8 @@ def _get_options_with_defaults(self, engine): pass else: raise ValueError( - "The %r option is not supported with the" - " %r engine" % (argname, engine) + f"The {repr(argname)} option is not supported with the" + f" {repr(engine)} engine" ) else: value = _deprecated_defaults.get(argname, default) @@ -3607,8 +3607,8 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 if not isinstance(self.colspecs, (tuple, list)): raise TypeError( - "column specifications must be a list or tuple, " - "input was a %r" % type(colspecs).__name__ + f"column specifications must be a list or tuple, " + f"input was a {repr(type(colspecs).__name__)}" ) for colspec in self.colspecs: From 9b9f283e4f44aa8ba12200b0812da2c48da1a97c Mon Sep 17 00:00:00 2001 From: jvpy Date: Wed, 4 Dec 2019 21:51:13 -0300 Subject: [PATCH 04/14] Revert "#29886 - Replace rm -rf pandas/ for repr() on parses.py" This reverts commit 182c68bf57d85950b78598745d959c22933bde7a. --- pandas/io/parsers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 24343d7b28680..7403e6d254d03 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -913,8 +913,8 @@ def _get_options_with_defaults(self, engine): pass else: raise ValueError( - f"The {repr(argname)} option is not supported with the" - f" {repr(engine)} engine" + "The %r option is not supported with the" + " %r engine" % (argname, engine) ) else: value = _deprecated_defaults.get(argname, default) @@ -3607,8 +3607,8 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 if not isinstance(self.colspecs, (tuple, list)): raise TypeError( - f"column specifications must be a list or tuple, " - f"input was a {repr(type(colspecs).__name__)}" + "column specifications must be a list or tuple, " + "input was a %r" % type(colspecs).__name__ ) for colspec in self.colspecs: From 80e8a1a7f4e80743b3e9db1fa6204434148b0021 Mon Sep 17 00:00:00 2001 From: jvpy Date: Wed, 4 Dec 2019 21:54:13 -0300 Subject: [PATCH 05/14] Revert "STY - Add repr to html.py and parsers.py - #29953" This reverts commit 029ee4dbfff5362bfe7d21e140d0e22517a0a068. --- pandas/io/html.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index ff401ee539aa9..b8cb6679a9562 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -103,7 +103,7 @@ def _get_skiprows(skiprows): elif skiprows is None: return 0 raise TypeError( - f"{repr(type(skiprows).__name__)} is not a valid type for skipping rows" + "%r is not a valid type for skipping rows" % type(skiprows).__name__ ) @@ -133,7 +133,7 @@ def _read(obj): except (TypeError, ValueError): pass else: - raise TypeError(f"Cannot read object of type {type(obj).__name__}") + raise TypeError("Cannot read object of type %r" % type(obj).__name__) return text From 198c0a46a0cfec6482d01b869f4767b5b620c121 Mon Sep 17 00:00:00 2001 From: jvpy Date: Wed, 4 Dec 2019 21:56:50 -0300 Subject: [PATCH 06/14] #29886 - Replace rm -rf pandas/ for repr() on parses.py --- pandas/io/html.py | 4 ++-- pandas/io/parsers.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index b8cb6679a9562..da149705eb8e7 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -103,7 +103,7 @@ def _get_skiprows(skiprows): elif skiprows is None: return 0 raise TypeError( - "%r is not a valid type for skipping rows" % type(skiprows).__name__ + f"{repr(% type(skiprows).__name__)} is not a valid type for skipping rows" ) @@ -133,7 +133,7 @@ def _read(obj): except (TypeError, ValueError): pass else: - raise TypeError("Cannot read object of type %r" % type(obj).__name__) + raise TypeError(f"Cannot read object of type {repr(type(obj).__name__)}") return text diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 7403e6d254d03..24343d7b28680 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -913,8 +913,8 @@ def _get_options_with_defaults(self, engine): pass else: raise ValueError( - "The %r option is not supported with the" - " %r engine" % (argname, engine) + f"The {repr(argname)} option is not supported with the" + f" {repr(engine)} engine" ) else: value = _deprecated_defaults.get(argname, default) @@ -3607,8 +3607,8 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 if not isinstance(self.colspecs, (tuple, list)): raise TypeError( - "column specifications must be a list or tuple, " - "input was a %r" % type(colspecs).__name__ + f"column specifications must be a list or tuple, " + f"input was a {repr(type(colspecs).__name__)}" ) for colspec in self.colspecs: From eed4528c4779bacce182a94cd1c0e50284c1342c Mon Sep 17 00:00:00 2001 From: jvpy Date: Thu, 5 Dec 2019 23:24:55 -0300 Subject: [PATCH 07/14] STY - fstrings on parser.py --- pandas/io/parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 961c37ca811df..24343d7b28680 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -3600,7 +3600,7 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 self.comment = comment if colspecs == "infer": self.colspecs = self.detect_colspecs( - infer_nrows=infer_nrows, skiprows=skiprow + infer_nrows=infer_nrows, skiprows=skiprows ) else: self.colspecs = colspecs From 9305b3f856ca11c5a2c72bdceb8a50ccd5e1168b Mon Sep 17 00:00:00 2001 From: jvpy Date: Sat, 7 Dec 2019 10:59:56 -0300 Subject: [PATCH 08/14] STY - removed unecessary repr --- pandas/io/html.py | 4 ++-- pandas/io/parsers.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index 138954cd6c0c5..3eaa1ffb99dfe 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -103,7 +103,7 @@ def _get_skiprows(skiprows): elif skiprows is None: return 0 raise TypeError( - f"{repr(type(skiprows).__name__)} is not a valid type for skipping rows" + f"{(type(skiprows).__name__)} is not a valid type for skipping rows" ) @@ -133,7 +133,7 @@ def _read(obj): except (TypeError, ValueError): pass else: - raise TypeError(f"Cannot read object of type {repr(type(obj).__name__)}") + raise TypeError(f"Cannot read object of type {(type(obj).__name__)}") return text diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 24343d7b28680..92957991039f6 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -913,8 +913,8 @@ def _get_options_with_defaults(self, engine): pass else: raise ValueError( - f"The {repr(argname)} option is not supported with the" - f" {repr(engine)} engine" + f"The {argname} option is not supported with the" + f" {engine} engine" ) else: value = _deprecated_defaults.get(argname, default) From a42ba49efe59eb58c269abb30903b64241e581a8 Mon Sep 17 00:00:00 2001 From: jvpy Date: Sun, 8 Dec 2019 00:41:33 -0300 Subject: [PATCH 09/14] Readded repr(foo) to parsers.py --- pandas/io/parsers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 92957991039f6..24343d7b28680 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -913,8 +913,8 @@ def _get_options_with_defaults(self, engine): pass else: raise ValueError( - f"The {argname} option is not supported with the" - f" {engine} engine" + f"The {repr(argname)} option is not supported with the" + f" {repr(engine)} engine" ) else: value = _deprecated_defaults.get(argname, default) From 2608e399a279d72d66044cdd8ded4fb891cc1acf Mon Sep 17 00:00:00 2001 From: jvpy Date: Sun, 8 Dec 2019 18:34:45 -0300 Subject: [PATCH 10/14] fix repr for parsers.py --- pandas/io/parsers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 24343d7b28680..b9fb6dfd2dcd6 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -1080,7 +1080,7 @@ def _clean_options(self, options, engine): if not isinstance(converters, dict): raise TypeError( f"Type converters must be a dict or subclass, " - f"input was a {repr(type(converters).__name__)}" + f"input was a {type(converters).__name__}" ) else: converters = {} @@ -3608,7 +3608,7 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 if not isinstance(self.colspecs, (tuple, list)): raise TypeError( f"column specifications must be a list or tuple, " - f"input was a {repr(type(colspecs).__name__)}" + f"input was a {type(colspecs).__name__}" ) for colspec in self.colspecs: From ae24a2026fdf9182013824b4efe5690b854debf7 Mon Sep 17 00:00:00 2001 From: jvpy Date: Sun, 8 Dec 2019 20:09:22 -0300 Subject: [PATCH 11/14] fix spaces on html.py --- pandas/io/html.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index 432f5d6f545cd..f40c55da6d36b 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -103,9 +103,7 @@ def _get_skiprows(skiprows): elif skiprows is None: return 0 raise TypeError( - - f"{(type(skiprows).__name__)} is not a valid type for skipping rows" - + f"{type(skiprows).__name__} is not a valid type for skipping rows" ) From a5ce1f2c6954f5254d3b7e25eebfd80f5ff82fbc Mon Sep 17 00:00:00 2001 From: jvpy Date: Sun, 8 Dec 2019 21:07:32 -0300 Subject: [PATCH 12/14] fix with black pandas on html.py --- pandas/io/html.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/io/html.py b/pandas/io/html.py index f40c55da6d36b..3521bad375aa6 100644 --- a/pandas/io/html.py +++ b/pandas/io/html.py @@ -102,9 +102,7 @@ def _get_skiprows(skiprows): return skiprows elif skiprows is None: return 0 - raise TypeError( - f"{type(skiprows).__name__} is not a valid type for skipping rows" - ) + raise TypeError(f"{type(skiprows).__name__} is not a valid type for skipping rows") def _read(obj): From bbf9f81fb43c817d6797b70eb8d64e4471a78ca5 Mon Sep 17 00:00:00 2001 From: jvpy Date: Mon, 9 Dec 2019 17:37:41 -0300 Subject: [PATCH 13/14] removed fstrings --- pandas/io/parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 199a24c87cc12..a07509d5c2829 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -3607,7 +3607,7 @@ def __init__(self, f, colspecs, delimiter, comment, skiprows=None, infer_nrows=1 if not isinstance(self.colspecs, (tuple, list)): raise TypeError( - f"column specifications must be a list or tuple, " + "column specifications must be a list or tuple, " f"input was a {type(colspecs).__name__}" ) From 2e63f0bf6596798e21e9d57f7071199a90775339 Mon Sep 17 00:00:00 2001 From: jvpy Date: Mon, 9 Dec 2019 20:02:01 -0300 Subject: [PATCH 14/14] removed fstrings --- pandas/io/parsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index a07509d5c2829..2d8787d1c4874 100755 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -1079,7 +1079,7 @@ def _clean_options(self, options, engine): if converters is not None: if not isinstance(converters, dict): raise TypeError( - f"Type converters must be a dict or subclass, " + "Type converters must be a dict or subclass, " f"input was a {type(converters).__name__}" ) else: