diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-07-11 18:49:32 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-07-11 18:49:32 +0200 |
| commit | 3556a2bc6605ac7267f420b3fb8d406b74616b47 (patch) | |
| tree | 116a4204a51868399c85f554bfae03fc660854ea /numpy/lib | |
| parent | 1a70875974aecec81de1866ad9847d511d420f65 (diff) | |
| download | numpy-3556a2bc6605ac7267f420b3fb8d406b74616b47.tar.gz | |
BUG: genfromtxt: make comments=None work with spaces in strings.
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/_iotools.py | 11 | ||||
| -rw-r--r-- | numpy/lib/tests/test_io.py | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/numpy/lib/_iotools.py b/numpy/lib/_iotools.py index 7921b4116..2f2a4bc57 100644 --- a/numpy/lib/_iotools.py +++ b/numpy/lib/_iotools.py @@ -203,13 +203,17 @@ class LineSplitter(object): self._handyman = _handyman # def _delimited_splitter(self, line): - line = line.split(self.comments)[0].strip(asbytes(" \r\n")) + if self.comments is not None: + line = line.split(self.comments)[0] + line = line.strip(asbytes(" \r\n")) if not line: return [] return line.split(self.delimiter) # def _fixedwidth_splitter(self, line): - line = line.split(self.comments)[0].strip(asbytes("\r\n")) + if self.comments is not None: + line = line.split(self.comments)[0] + line = line.strip(asbytes("\r\n")) if not line: return [] fixed = self.delimiter @@ -217,7 +221,8 @@ class LineSplitter(object): return [line[s] for s in slices] # def _variablewidth_splitter(self, line): - line = line.split(self.comments)[0] + if self.comments is not None: + line = line.split(self.comments)[0] if not line: return [] slices = self.delimiter diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py index aeda7663c..0762c82e1 100644 --- a/numpy/lib/tests/test_io.py +++ b/numpy/lib/tests/test_io.py @@ -1454,6 +1454,9 @@ M 33 21.99 test = np.genfromtxt(StringIO("test1,testNonetherestofthedata"), dtype=None, comments=None, delimiter=',') assert_equal(test[1], asbytes('testNonetherestofthedata')) + test = np.genfromtxt(StringIO("test1, testNonetherestofthedata"), + dtype=None, comments=None, delimiter=',') + assert_equal(test[1], asbytes(' testNonetherestofthedata')) def test_recfromtxt(self): # |