Show More
@@ -3,5 +3,4 b' try:' | |||||
3 | from numpy.testing.noseclasses import KnownFailure |
|
3 | from numpy.testing.noseclasses import KnownFailure | |
4 | except ImportError: |
|
4 | except ImportError: | |
5 | from _decorators import * |
|
5 | from _decorators import * | |
6 | # KnownFailure imported in _decorators from local version of |
|
6 | from _numpy_testing_noseclasses import KnownFailure | |
7 | # noseclasses which is in _numpy_testing_noseclasses |
|
@@ -20,15 +20,8 b' import warnings' | |||||
20 | #from numpy.testing.utils import \ |
|
20 | #from numpy.testing.utils import \ | |
21 | # WarningManager, WarningMessage |
|
21 | # WarningManager, WarningMessage | |
22 | # Our version: |
|
22 | # Our version: | |
23 | try: |
|
23 | from _numpy_testing_utils import WarningManager | |
24 | from numpy.testing.utils import WarningManager, WarningMessage |
|
24 | from _numpy_testing_noseclasses import KnownFailureTest | |
25 | except ImportError: |
|
|||
26 | from _numpy_testing_utils import WarningManager, WarningMessage |
|
|||
27 |
|
||||
28 | try: |
|
|||
29 | from numpy.testing.noseclasses import KnownFailure, KnownFailureTest |
|
|||
30 | except ImportError: |
|
|||
31 | from _numpy_testing_noseclasses import KnownFailure, KnownFailureTest |
|
|||
32 |
|
25 | |||
33 | # End IPython changes |
|
26 | # End IPython changes | |
34 |
|
27 |
General Comments 0
You need to be logged in to leave comments.
Login now