Skip to content

Reallow usecols to reference OOB indices - reverts 25623 #27426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion doc/source/whatsnew/v0.25.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ I/O
- Bug in :meth:`DataFrame.to_html` where header numbers would ignore display options when rounding (:issue:`17280`)
- Bug in :func:`read_hdf` where reading a table from an HDF5 file written directly with PyTables fails with a ``ValueError`` when using a sub-selection via the ``start`` or ``stop`` arguments (:issue:`11188`)
- Bug in :func:`read_hdf` not properly closing store after a ``KeyError`` is raised (:issue:`25766`)
- Bug in ``read_csv`` which would not raise ``ValueError`` if a column index in ``usecols`` was out of bounds (:issue:`25623`)
- Improved the explanation for the failure when value labels are repeated in Stata dta files and suggested work-arounds (:issue:`25772`)
- Improved :meth:`pandas.read_stata` and :class:`pandas.io.stata.StataReader` to read incorrectly formatted 118 format files saved by Stata (:issue:`25960`)
- Improved the ``col_space`` parameter in :meth:`DataFrame.to_html` to accept a string so CSS length values can be set correctly (:issue:`25941`)
Expand Down
20 changes: 1 addition & 19 deletions pandas/io/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1947,12 +1947,6 @@ def __init__(self, src, **kwds):
):
_validate_usecols_names(usecols, self.orig_names)

# GH 25623
# validate that column indices in usecols are not out of bounds
elif self.usecols_dtype == "integer":
indices = range(self._reader.table_width)
_validate_usecols_names(usecols, indices)

if len(self.names) > len(usecols):
self.names = [
n
Expand Down Expand Up @@ -2258,7 +2252,7 @@ def __init__(self, f, **kwds):
self.skipinitialspace = kwds["skipinitialspace"]
self.lineterminator = kwds["lineterminator"]
self.quoting = kwds["quoting"]
self.usecols, self.usecols_dtype = _validate_usecols_arg(kwds["usecols"])
self.usecols, _ = _validate_usecols_arg(kwds["usecols"])
self.skip_blank_lines = kwds["skip_blank_lines"]

self.warn_bad_lines = kwds["warn_bad_lines"]
Expand Down Expand Up @@ -2665,13 +2659,6 @@ def _infer_columns(self):
if clear_buffer:
self._clear_buffer()

# GH 25623
# validate that column indices in usecols are not out of bounds
if self.usecols_dtype == "integer":
for col in columns:
indices = range(len(col))
_validate_usecols_names(self.usecols, indices)

if names is not None:
if (self.usecols is not None and len(names) != len(self.usecols)) or (
self.usecols is None and len(names) != len(columns[0])
Expand Down Expand Up @@ -2706,11 +2693,6 @@ def _infer_columns(self):
ncols = len(line)
num_original_columns = ncols

# GH 25623
# validate that column indices in usecols are not out of bounds
if self.usecols_dtype == "integer":
_validate_usecols_names(self.usecols, range(ncols))

if not names:
if self.prefix:
columns = [
Expand Down
19 changes: 0 additions & 19 deletions pandas/tests/io/parser/test_usecols.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,6 @@
)


@pytest.mark.parametrize(
"names,usecols,missing",
[
(None, [0, 3], r"\[3\]"),
(["a", "b", "c"], [0, -1, 2], r"\[-1\]"),
(None, [3], r"\[3\]"),
(["a"], [3], r"\[3\]"),
],
)
def test_usecols_out_of_bounds(all_parsers, names, usecols, missing):
# See gh-25623
data = "a,b,c\n1,2,3\n4,5,6"
parser = all_parsers

mssg = _msg_validate_usecols_names.format(missing)
with pytest.raises(ValueError, match=mssg):
parser.read_csv(StringIO(data), usecols=usecols, names=names)


def test_raise_on_mixed_dtype_usecols(all_parsers):
# See gh-12678
data = """a,b,c
Expand Down