Skip to content

Commit 462b10f

Browse files
committed
Merge pull request #4030 from ogiaquino/Remove_import_nose_in_testing.py
BUG: Removed import nose on top of testing.py script
2 parents e12d6f7 + 7ea35c8 commit 462b10f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

pandas/util/testing.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
from distutils.version import LooseVersion
1616
import urllib2
17-
import nose
1817

1918
from numpy.random import randn
2019
import numpy as np
@@ -755,6 +754,7 @@ def network(t, raise_on_error=_RAISE_NETWORK_ERROR_DEFAULT,
755754
network connectivity. ``_RAISE_NETWORK_ERROR_DEFAULT`` in
756755
``pandas/util/testing.py`` sets the default behavior (currently False).
757756
"""
757+
from nose import SkipTest
758758
t.network = True
759759

760760
@wraps(t)
@@ -765,7 +765,7 @@ def network_wrapper(*args, **kwargs):
765765
try:
766766
return t(*args, **kwargs)
767767
except error_classes as e:
768-
raise nose.SkipTest("Skipping test %s" % e)
768+
raise SkipTest("Skipping test %s" % e)
769769

770770
return network_wrapper
771771

@@ -839,21 +839,22 @@ def with_connectivity_check(t, url="http://www.google.com",
839839
...
840840
SkipTest
841841
"""
842+
from nose import SkipTest
842843
t.network = True
843844

844845
@wraps(t)
845846
def wrapper(*args, **kwargs):
846847
if check_before_test and not raise_on_error:
847848
if not can_connect(url):
848-
raise nose.SkipTest
849+
raise SkipTest
849850
try:
850851
return t(*args, **kwargs)
851852
except error_classes as e:
852853
if raise_on_error or can_connect(url):
853854
raise
854855
else:
855-
raise nose.SkipTest("Skipping test due to lack of connectivity"
856-
" and error %s" % e)
856+
raise SkipTest("Skipping test due to lack of connectivity"
857+
" and error %s" % e)
857858

858859
return wrapper
859860

0 commit comments

Comments
 (0)