diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-28 17:13:53 -0600 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-02 11:23:58 -0600 |
commit | 09a52ed47bb26498c97a579ce1147861df696d84 (patch) | |
tree | 39bbddec620188f8cf09a5eb51370b0db1236219 /numpy/lib/tests/test_regression.py | |
parent | a939f2aa83e7d37d5e35e7c2a8c539c59f682598 (diff) | |
download | numpy-09a52ed47bb26498c97a579ce1147861df696d84.tar.gz |
2to3: Apply `imports` fixer.
The `imports` fixer deals with the standard packages that have been
renamed, removed, or methods that have moved.
cPickle -- removed, use pickle
commands -- removed, getoutput, getstatusoutput moved to subprocess
urlparse -- removed, urlparse moved to urllib.parse
cStringIO -- removed, use StringIO or io.StringIO
copy_reg -- renamed copyreg
_winreg -- renamed winreg
ConfigParser -- renamed configparser
__builtin__ -- renamed builtins
In the case of `cPickle`, it is imported as `pickle` when python < 3 and
performance may be a consideration, but otherwise plain old `pickle` is
used.
Dealing with `StringIO` is a bit tricky. There is an `io.StringIO`
function in the `io` module, available since Python 2.6, but it expects
unicode whereas `StringIO.StringIO` expects ascii. The Python 3
equivalent is then `io.BytesIO`. What I have done here is used BytesIO
for anything that is emulating a file for testing purposes. That is more
explicit than using a redefined StringIO as was done before we dropped
support for Python 2.4 and 2.5.
Closes #3180.
Diffstat (limited to 'numpy/lib/tests/test_regression.py')
-rw-r--r-- | numpy/lib/tests/test_regression.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/numpy/lib/tests/test_regression.py b/numpy/lib/tests/test_regression.py index 9e303d2b1..2e76b320c 100644 --- a/numpy/lib/tests/test_regression.py +++ b/numpy/lib/tests/test_regression.py @@ -1,5 +1,6 @@ from __future__ import division, absolute_import +import sys from numpy.testing import * from numpy.testing.utils import _assert_valid_refcount import numpy as np @@ -202,7 +203,11 @@ class TestRegression(TestCase): def test_loadtxt_fields_subarrays(self): # For ticket #1936 - from StringIO import StringIO + if sys.version_info[0] >= 3: + from io import StringIO + else: + from StringIO import StringIO + dt = [("a", 'u1', 2), ("b", 'u1', 2)] x = np.loadtxt(StringIO("0 1 2 3"), dtype=dt) assert_equal(x, np.array([((0, 1), (2, 3))], dtype=dt)) |