summaryrefslogtreecommitdiff
path: root/numpy/lib/tests/test_regression.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2013-04-06 07:42:08 -0700
committerCharles Harris <charlesr.harris@gmail.com>2013-04-06 07:42:08 -0700
commit49a8902a673d6fb2ba9ca446fc652aa9d2e55e1b (patch)
treee71c0d8f6123307860a58796ed840bf32526b3fe /numpy/lib/tests/test_regression.py
parent3c8fc14665548c71a9cd144b2e16d9309a92e255 (diff)
parent4394515cd5632a7f110993ff75033d407d10861d (diff)
downloadnumpy-49a8902a673d6fb2ba9ca446fc652aa9d2e55e1b.tar.gz
Merge pull request #3191 from charris/2to3-apply-imports-fixer
2to3: Apply `imports` fixer.
Diffstat (limited to 'numpy/lib/tests/test_regression.py')
-rw-r--r--numpy/lib/tests/test_regression.py7
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))