-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
ENH/TST/DOC: set infer_nrows for read_fwf (GH15138) #23238
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
Changes from 7 commits
057eb29
9a9609d
68d83c9
da081a8
3f69510
f3e715d
1df0493
a35abd8
d5de9d9
49d5594
6675dac
e1500cc
de29edf
c4cfd9e
0853be7
3325262
d8c307e
cc1ce14
ecf35d6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -342,14 +342,17 @@ | |
_engine_doc)) | ||
|
||
_fwf_widths = """\ | ||
colspecs : list of pairs (int, int) or 'infer'. optional | ||
colspecs : list of pairs (int, int) or 'infer', default 'infer' | ||
A list of pairs (tuples) giving the extents of the fixed-width | ||
fields of each line as half-open intervals (i.e., [from, to[ ). | ||
fields of each line as half-open intervals (i.e., [from, to) ). | ||
String value 'infer' can be used to instruct the parser to try | ||
detecting the column specifications from the first 100 rows of | ||
the data which are not being skipped via skiprows (default='infer'). | ||
widths : list of ints. optional | ||
A list of field widths which can be used instead of 'colspecs' if | ||
detecting the column specifications using the ``infer_nrows`` | ||
number of rows of the data which are not being skipped via skiprows. | ||
infer_nrows : int, default 100 | ||
The number of rows to consider when letting the parser determine the | ||
``colspecs``. | ||
widths : list of ints, optional | ||
A list of field widths which can be used instead of ``colspecs`` if | ||
the intervals are contiguous. | ||
delimiter : str, default ``'\t' + ' '`` | ||
Characters to consider as filler characters in the fixed-width file. | ||
|
@@ -527,6 +530,7 @@ def _read(filepath_or_buffer, kwds): | |
|
||
_fwf_defaults = { | ||
'colspecs': 'infer', | ||
'infer_nrows': 100, | ||
'widths': None, | ||
} | ||
|
||
|
@@ -716,7 +720,8 @@ def parser_f(filepath_or_buffer, | |
|
||
|
||
@Appender(_read_fwf_doc) | ||
def read_fwf(filepath_or_buffer, colspecs='infer', widths=None, **kwds): | ||
def read_fwf(filepath_or_buffer, colspecs='infer', widths=None, | ||
infer_nrows=100, **kwds): | ||
# Check input arguments. | ||
if colspecs is None and widths is None: | ||
raise ValueError("Must specify either colspecs or widths") | ||
|
@@ -732,6 +737,7 @@ def read_fwf(filepath_or_buffer, colspecs='infer', widths=None, **kwds): | |
col += w | ||
|
||
kwds['colspecs'] = colspecs | ||
kwds['infer_nrows'] = infer_nrows | ||
kwds['engine'] = 'python-fwf' | ||
return _read(filepath_or_buffer, kwds) | ||
|
||
|
@@ -3361,13 +3367,15 @@ class FixedWidthReader(BaseIterator): | |
A reader of fixed-width lines. | ||
""" | ||
|
||
def __init__(self, f, colspecs, delimiter, comment, skiprows=None): | ||
def __init__(self, f, colspecs, delimiter, comment, infer_nrows=100, | ||
skiprows=None): | ||
self.f = f | ||
self.buffer = None | ||
self.delimiter = '\r\n' + delimiter if delimiter else '\n\r\t ' | ||
self.comment = comment | ||
if colspecs == 'infer': | ||
self.colspecs = self.detect_colspecs(skiprows=skiprows) | ||
self.colspecs = self.detect_colspecs(infer_nrows=infer_nrows, | ||
skiprows=skiprows) | ||
else: | ||
self.colspecs = colspecs | ||
|
||
|
@@ -3420,11 +3428,11 @@ def get_rows(self, n, skiprows=None): | |
self.buffer = iter(buffer_rows) | ||
return detect_rows | ||
|
||
def detect_colspecs(self, n=100, skiprows=None): | ||
def detect_colspecs(self, infer_nrows=100, skiprows=None): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh, I actually see another problem here. I co-opted |
||
# Regex escape the delimiters | ||
delimiters = ''.join(r'\%s' % x for x in self.delimiter) | ||
pattern = re.compile('([^%s]+)' % delimiters) | ||
rows = self.get_rows(n, skiprows) | ||
rows = self.get_rows(infer_nrows, skiprows) | ||
if not rows: | ||
raise EmptyDataError("No rows from which to infer column width") | ||
max_len = max(map(len, rows)) | ||
|
@@ -3463,8 +3471,10 @@ class FixedWidthFieldParser(PythonParser): | |
def __init__(self, f, **kwds): | ||
# Support iterators, convert to a list. | ||
self.colspecs = kwds.pop('colspecs') | ||
self.infer_nrows = kwds.pop('infer_nrows') | ||
PythonParser.__init__(self, f, **kwds) | ||
|
||
def _make_reader(self, f): | ||
self.data = FixedWidthReader(f, self.colspecs, self.delimiter, | ||
self.comment, self.skiprows) | ||
self.comment, self.infer_nrows, | ||
self.skiprows) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still need to change position of
infer_nrows
to be at the end here