diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2014-10-03 20:03:31 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2014-10-03 20:06:48 -0600 |
| commit | dc453917978e98dcdf3bbc106b080c80f0a1301e (patch) | |
| tree | 010d0bea581ca040c93dcc41113e88fa69262f60 /numpy | |
| parent | bbb7c3fbcdc2ddfcf79317661be2b99b1f6617e3 (diff) | |
| download | numpy-dc453917978e98dcdf3bbc106b080c80f0a1301e.tar.gz | |
BUG: Make numpy import when run with Python flag '-OO'.
This consists of checking for a docstring equal to None and skipping two
tests that require docstrings.
Closes #5148.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/lib/tests/test_function_base.py | 6 | ||||
| -rw-r--r-- | numpy/lib/tests/test_utils.py | 3 | ||||
| -rw-r--r-- | numpy/ma/extras.py | 8 |
3 files changed, 12 insertions, 5 deletions
diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py index ee38b3573..a3f805691 100644 --- a/numpy/lib/tests/test_function_base.py +++ b/numpy/lib/tests/test_function_base.py @@ -1,12 +1,14 @@ from __future__ import division, absolute_import, print_function import warnings +import sys import numpy as np from numpy.testing import ( run_module_suite, TestCase, assert_, assert_equal, assert_array_equal, assert_almost_equal, assert_array_almost_equal, assert_raises, - assert_allclose, assert_array_max_ulp, assert_warns, assert_raises_regex + assert_allclose, assert_array_max_ulp, assert_warns, + assert_raises_regex, dec ) from numpy.random import rand from numpy.lib import * @@ -2094,6 +2096,8 @@ class TestAdd_newdoc_ufunc(TestCase): class TestAdd_newdoc(TestCase): + + @dec.skipif(sys.flags.optimize == 2) def test_add_doc(self): # test np.add_newdoc tgt = "Current flat index into the array." diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py index fcb37f98a..8fbd1c445 100644 --- a/numpy/lib/tests/test_utils.py +++ b/numpy/lib/tests/test_utils.py @@ -3,7 +3,7 @@ from __future__ import division, absolute_import, print_function import sys from numpy.core import arange from numpy.testing import ( - run_module_suite, assert_, assert_equal + run_module_suite, assert_, assert_equal, dec ) from numpy.lib import deprecate import numpy.lib.utils as utils @@ -14,6 +14,7 @@ else: from StringIO import StringIO +@dec.skipif(sys.flags.optimize == 2) def test_lookfor(): out = StringIO() utils.lookfor('eigenvalue', module='numpy', output=out, diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index 82a61a67c..a993fd05d 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -434,8 +434,10 @@ def apply_over_axes(func, a, axes): raise ValueError("function is not returning " "an array of the correct shape") return val -apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ - :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ + +if apply_over_axes.__doc__ is not None: + apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ + :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ """ Examples @@ -462,7 +464,7 @@ apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ [[[46] [--] [124]]] -""" + """ def average(a, axis=None, weights=None, returned=False): |