diff options
Diffstat (limited to 'setuptools/tests/server.py')
| -rw-r--r-- | setuptools/tests/server.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index f116a3fd..f4aaaa1c 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -1,6 +1,7 @@ """Basic http server for tests to simulate PyPI or custom indexes """ import urllib2 +import sys from threading import Thread from BaseHTTPServer import HTTPServer from SimpleHTTPServer import SimpleHTTPRequestHandler @@ -33,7 +34,11 @@ class IndexServer(HTTPServer): """self.shutdown is not supported on python < 2.6""" self._run = False try: - urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, None, 5) + if sys.version > '2.6': + urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port, + None, 5) + else: + urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port) except urllib2.URLError: pass self.thread.join() |