Merge pull request #4069 from takluyver/drop-nosepatch

Drop monkeypatch for pre-1.0 nose
This commit is contained in:
Thomas Kluyver 2013-08-21 18:36:16 -07:00
commit ffbf79c20c

View File

@ -37,12 +37,6 @@ import tempfile
import time
import warnings
# Note: monkeypatch!
# We need to monkeypatch a small problem in nose itself first, before importing
# it for actual use. This should get into nose upstream, but its release cycle
# is slow and we need it for our parametric tests to work correctly.
from IPython.testing import nosepatch
# Now, proceed to import nose itself
import nose.plugins.builtin
from nose.plugins.xunit import Xunit