diff options
author | Julian Taylor <juliantaylor108@gmail.com> | 2017-03-25 14:47:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-25 14:47:04 +0100 |
commit | ab49be1d5a6f1a7c51298a8fe46a9f43bb2bb33b (patch) | |
tree | 434f751384e02a2d386dda491527c50fed070625 /numpy/lib/tests/test_arraypad.py | |
parent | a7ed83f6d9e5e8f5a024dfe2d42ad290d79422b1 (diff) | |
parent | 1dc20cba80660ee9f2b16e26c0d6e7f23bf9e08f (diff) | |
download | numpy-ab49be1d5a6f1a7c51298a8fe46a9f43bb2bb33b.tar.gz |
Merge pull request #8832 from eric-wieser/avoid-as-bytes
MAINT: Remove python <2.7,<3.3 string/unicode workarounds
Diffstat (limited to 'numpy/lib/tests/test_arraypad.py')
-rw-r--r-- | numpy/lib/tests/test_arraypad.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py index d037962e6..056aa4582 100644 --- a/numpy/lib/tests/test_arraypad.py +++ b/numpy/lib/tests/test_arraypad.py @@ -986,10 +986,7 @@ class TestNdarrayPadWidth(TestCase): class TestUnicodeInput(TestCase): def test_unicode_mode(self): - try: - constant_mode = unicode('constant') - except NameError: - constant_mode = 'constant' + constant_mode = u'constant' a = np.pad([1], 2, mode=constant_mode) b = np.array([0, 0, 1, 0, 0]) assert_array_equal(a, b) |