diff --git a/IPython/testing/nosepatch.py b/IPython/testing/nosepatch.py index 423688e..55f62c2 100644 --- a/IPython/testing/nosepatch.py +++ b/IPython/testing/nosepatch.py @@ -3,7 +3,12 @@ By default, nose's ismethod() fails for static methods. Once this is fixed in upstream nose we can disable it. -Note: merely importing this module causes the monkeypatch to be applied.""" +Notes: + +- As of Nose 1.0.0, the problem persists so this monkeypatch is still +needed. + +- Merely importing this module causes the monkeypatch to be applied.""" #----------------------------------------------------------------------------- # Copyright (C) 2009-2011 The IPython Development Team diff --git a/IPython/testing/skipdoctest.py b/IPython/testing/skipdoctest.py index 0c18914..c055f43 100644 --- a/IPython/testing/skipdoctest.py +++ b/IPython/testing/skipdoctest.py @@ -1,11 +1,27 @@ -"""This decorator marks that a doctest should be skipped. +"""Decorators marks that a doctest should be skipped, for both python 2 and 3. The IPython.testing.decorators module triggers various extra imports, including numpy and sympy if they're present. Since this decorator is used in core parts of IPython, it's in a separate module so that running IPython doesn't trigger those imports.""" + +#----------------------------------------------------------------------------- +# Copyright (C) 2009-2011 The IPython Development Team +# +# Distributed under the terms of the BSD License. The full license is in +# the file COPYING, distributed as part of this software. +#----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Imports +#----------------------------------------------------------------------------- + import sys +#----------------------------------------------------------------------------- +# Decorators +#----------------------------------------------------------------------------- + def skip_doctest(f): """Decorator - mark a function or method for skipping its doctest. @@ -15,6 +31,7 @@ def skip_doctest(f): f.skip_doctest = True return f + def skip_doctest_py3(f): """Decorator - skip the doctest under Python 3.""" f.skip_doctest = (sys.version_info[0] >= 3)