From 7403bafc5d3a5fb85e4820b77adf93562f29e6fb 2011-04-08 23:16:01 From: MinRK Date: 2011-04-08 23:16:01 Subject: [PATCH] don't unconditionally import nose Commit b64f754008964caef3b2a7620510b5c80f755fb0 broke IPython entirely in the absence of nose (even setup.py). --- diff --git a/IPython/external/decorators/__init__.py b/IPython/external/decorators/__init__.py index 79b00c3..6401893 100644 --- a/IPython/external/decorators/__init__.py +++ b/IPython/external/decorators/__init__.py @@ -3,4 +3,7 @@ try: from numpy.testing.noseclasses import KnownFailure except ImportError: from _decorators import * - from _numpy_testing_noseclasses import KnownFailure + try: + from _numpy_testing_noseclasses import KnownFailure + except ImportError: + pass diff --git a/IPython/external/decorators/_decorators.py b/IPython/external/decorators/_decorators.py index 7aaa1ed..3698a98 100644 --- a/IPython/external/decorators/_decorators.py +++ b/IPython/external/decorators/_decorators.py @@ -21,7 +21,10 @@ import warnings # WarningManager, WarningMessage # Our version: from _numpy_testing_utils import WarningManager -from _numpy_testing_noseclasses import KnownFailureTest +try: + from _numpy_testing_noseclasses import KnownFailureTest +except: + pass # End IPython changes