Adjusts the test_server 'fetch' method to disable proxying within test cases where it is used

1 files changed, 5 insertions, 3 deletions

diff --git a/test/test_server.py b/test/test_server.py
index b6ff9a2..4d64306 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -11,9 +11,9 @@ from . import tools
 from bottle import _e
 
 try:
-    from urllib.request import urlopen
+    from urllib.request import ProxyHandler, build_opener
 except:
-    from urllib2 import urlopen
+    from urllib2 import ProxyHandler, build_opener
 
 serverscript = os.path.join(os.path.dirname(__file__), 'servertest.py')
 
@@ -77,8 +77,10 @@ class TestServer(unittest.TestCase):
                     raise AssertionError(line.strip().decode('utf8'))
 
     def fetch(self, url):
+        proxy_handler = ProxyHandler(proxies={})
+        url_opener = build_opener(proxy_handler)
         try:
-            return urlopen('http://127.0.0.1:%d/%s' % (self.port, url)).read()
+            return url_opener.open('http://127.0.0.1:%d/%s' % (self.port, url)).read()
         except Exception:
             return repr(_e())