diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-03-25 11:01:22 +0000 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-03-25 11:55:08 +0000 |
| commit | 91548b509b63fe365c941d2fb1ec005ccc55a8ac (patch) | |
| tree | cf597ddbd0ecc1ddfb1c4a9899eed0bc8528acdc /numpy/ma | |
| parent | 09a21de418ef8df60a0121637cb213e0fa778e5d (diff) | |
| download | numpy-91548b509b63fe365c941d2fb1ec005ccc55a8ac.tar.gz | |
MAINT: Stop using sixu instead of a u prefix
Diffstat (limited to 'numpy/ma')
| -rw-r--r-- | numpy/ma/core.py | 4 | ||||
| -rw-r--r-- | numpy/ma/tests/test_regression.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/numpy/ma/core.py b/numpy/ma/core.py index e78d1601d..ca233ca9f 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -39,7 +39,7 @@ from numpy import ndarray, amax, amin, iscomplexobj, bool_, _NoValue from numpy import array as narray from numpy.lib.function_base import angle from numpy.compat import ( - getargspec, formatargspec, long, basestring, unicode, bytes, sixu + getargspec, formatargspec, long, basestring, unicode, bytes ) from numpy import expand_dims as n_expand_dims from numpy.core.multiarray import normalize_axis_index @@ -159,7 +159,7 @@ default_filler = {'b': True, 'S': b'N/A', 'u': 999999, 'V': '???', - 'U': sixu('N/A') + 'U': u'N/A' } # Add datetime64 and timedelta64 types diff --git a/numpy/ma/tests/test_regression.py b/numpy/ma/tests/test_regression.py index fc6cdfaff..d1fb2bb2b 100644 --- a/numpy/ma/tests/test_regression.py +++ b/numpy/ma/tests/test_regression.py @@ -6,7 +6,6 @@ import numpy as np from numpy.testing import (assert_, TestCase, assert_array_equal, assert_allclose, run_module_suite, suppress_warnings) -from numpy.compat import sixu rlevel = 1 @@ -44,7 +43,7 @@ class TestRegression(TestCase): def test_masked_array_repr_unicode(self): # Ticket #1256 - repr(np.ma.array(sixu("Unicode"))) + repr(np.ma.array(u"Unicode")) def test_atleast_2d(self): # Ticket #1559 |