diff options
author | Derek Homeier <dhomeie@gwdg.de> | 2014-08-27 13:42:32 +0200 |
---|---|---|
committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-08-27 15:50:28 +0200 |
commit | 709a06d0e9db862a8dd519db13724a4c59de7d69 (patch) | |
tree | fd1c844aa70fc050716347e61d717e055c6487ce /numpy/lib/npyio.py | |
parent | 79d36359bf18a122577054072d5c846aded3f2b4 (diff) | |
download | numpy-709a06d0e9db862a8dd519db13724a4c59de7d69.tar.gz |
BUG: fix genfromtxt check of converters when using usecols
fixes an issue reported by Adrian Altenhoff where user-supplied
converters in genfromtxt were not tested with the right first_values
when also specifying usecols.
Diffstat (limited to 'numpy/lib/npyio.py')
-rw-r--r-- | numpy/lib/npyio.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py index fe855a71a..e6b4d426f 100644 --- a/numpy/lib/npyio.py +++ b/numpy/lib/npyio.py @@ -1574,22 +1574,25 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None, for (miss, fill) in zipit] # Update the converters to use the user-defined ones uc_update = [] - for (i, conv) in user_converters.items(): + for (j, conv) in user_converters.items(): # If the converter is specified by column names, use the index instead - if _is_string_like(i): + if _is_string_like(j): try: - i = names.index(i) + j = names.index(j) + i = j except ValueError: continue elif usecols: try: - i = usecols.index(i) + i = usecols.index(j) except ValueError: # Unused converter specified continue - # Find the value to test: + else: + i = j + # Find the value to test - first_line is not filtered by usecols: if len(first_line): - testing_value = first_values[i] + testing_value = first_values[j] else: testing_value = None converters[i].update(conv, locked=True, |