BUG: Correctly stub out urllib2.urlopen() for tests given the refactoring of the local imports.

2 files changed, 10 insertions, 4 deletions

diff --git a/numpy/lib/_datasource.py b/numpy/lib/_datasource.py
index 0dc744dbc..d70e5db9d 100644
--- a/numpy/lib/_datasource.py
+++ b/numpy/lib/_datasource.py
@@ -341,7 +341,7 @@ class DataSource (object):
         """
         # We import this here because importing urllib2 is slow and
         # a significant fraction of numpy's total import time.
-        from urllib2 import URLError
+        from urllib2 import urlopen, URLError
 
         # Test local path
         if os.path.exists(path):
diff --git a/numpy/lib/tests/test__datasource.py b/numpy/lib/tests/test__datasource.py
index d55e52973..c9e9b2eee 100644
--- a/numpy/lib/tests/test__datasource.py
+++ b/numpy/lib/tests/test__datasource.py
@@ -6,6 +6,7 @@ from tempfile import mkdtemp, mkstemp, NamedTemporaryFile
 from shutil import rmtree
 from urlparse import urlparse
 from urllib2 import URLError
+import urllib2
 
 from numpy.testing import *
 
@@ -19,9 +20,14 @@ def urlopen_stub(url, data=None):
     else:
         raise URLError('Name or service not known')
 
-# Rebind urlopen during testing.  For a 'real' test, uncomment the rebinding
-# below.
-datasource.urlopen = urlopen_stub
+old_urlopen = None
+def setup():
+    global old_urlopen
+    old_urlopen = urllib2.urlopen
+    urllib2.urlopen = urlopen_stub
+
+def teardown():
+    urllib2.urlopen = old_urlopen
 
 # A valid website for more robust testing
 http_path = 'http://www.google.com/'