summaryrefslogtreecommitdiff
path: root/numpy/lib/npyio.py
diff options
context:
space:
mode:
authorYaron de Leeuw <jarondl@server.fake>2013-10-06 09:15:39 +0300
committerYaron de Leeuw <jarondl@server.fake>2013-10-06 09:15:39 +0300
commit6c189917beef5b68c1caea49d5389690c54f8c61 (patch)
tree9e0ef967c5ed54096f8158ccca70ad977781c3ca /numpy/lib/npyio.py
parente765197d9d64563e50f1b9e541d1e4724eb5d82f (diff)
downloadnumpy-6c189917beef5b68c1caea49d5389690c54f8c61.tar.gz
STY: pep8 for npyio continued
Two slight style modifications in npyio, regarding line length.
Diffstat (limited to 'numpy/lib/npyio.py')
-rw-r--r--numpy/lib/npyio.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 4a2faf473..8053721f9 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -1322,8 +1322,7 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
if not isinstance(user_converters, dict):
raise TypeError(
"The input argument 'converter' should be a valid dictionary "
- "(got '%s' instead)"
- % type(user_converters))
+ "(got '%s' instead)" % type(user_converters))
# Initialize the filehandle, the LineSplitter and the NameValidator
own_fhd = False
@@ -1531,11 +1530,9 @@ def genfromtxt(fname, dtype=float, comments='#', delimiter=None,
if len(dtype_flat) > 1:
# Flexible type : get a converter from each dtype
zipit = zip(dtype_flat, missing_values, filling_values)
- converters = [
- StringConverter(dt, locked=True, missing_values=miss,
- default=fill)
- for (dt, miss, fill) in zipit
- ]
+ converters = [StringConverter(dt, locked=True,
+ missing_values=miss, default=fill)
+ for (dt, miss, fill) in zipit]
else:
# Set to a default converter (but w/ different missing values)
zipit = zip(missing_values, filling_values)