diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/lib/tests/test__iotools.py | 17 | ||||
| -rw-r--r-- | numpy/ma/core.py | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/numpy/lib/tests/test__iotools.py b/numpy/lib/tests/test__iotools.py index 3c4bc9bb6..952594c34 100644 --- a/numpy/lib/tests/test__iotools.py +++ b/numpy/lib/tests/test__iotools.py @@ -130,11 +130,14 @@ class TestStringConverter(TestCase): # def test_upgrademapper(self): "Tests updatemapper" - import dateutil.parser - import datetime - dateparser = dateutil.parser.parse - StringConverter.upgrade_mapper(dateparser, datetime.date(2000,1,1)) - convert = StringConverter(dateparser, datetime.date(2000, 1, 1)) - test = convert('2001-01-01') - assert_equal(test, datetime.datetime(2001, 01, 01, 00, 00, 00)) + try: + import dateutil.parser + import datetime + dateparser = dateutil.parser.parse + StringConverter.upgrade_mapper(dateparser, datetime.date(2000,1,1)) + convert = StringConverter(dateparser, datetime.date(2000, 1, 1)) + test = convert('2001-01-01') + assert_equal(test, datetime.datetime(2001, 01, 01, 00, 00, 00)) + except ImportError: + pass diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 14f5ad01f..2b50cc55a 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -2466,7 +2466,7 @@ class MaskedArray(ndarray): # def __rmul__(self, other): "Multiply other by self, and return a new masked array." - return multiply(other, self) + return multiply(self, other) # def __div__(self, other): "Divide other into self, and return a new masked array." |