diff options
| author | Tarek Ziade <tarek@ziade.org> | 2010-07-03 15:12:05 +0200 |
|---|---|---|
| committer | Tarek Ziade <tarek@ziade.org> | 2010-07-03 15:12:05 +0200 |
| commit | 5c7f1d086631316d3fe22e97a26b26e2c18c0a1c (patch) | |
| tree | ccad63091d07b46b34eaa2f912c8c7321b9222f9 /setuptools/tests/server.py | |
| parent | 79a00a3182447a66a2106761dfabda0e16d0ba19 (diff) | |
| parent | 72c44b3258e02b56ac106f878a64eca726a6f01f (diff) | |
| download | external_python_setuptools-5c7f1d086631316d3fe22e97a26b26e2c18c0a1c.tar.gz external_python_setuptools-5c7f1d086631316d3fe22e97a26b26e2c18c0a1c.tar.bz2 external_python_setuptools-5c7f1d086631316d3fe22e97a26b26e2c18c0a1c.zip | |
merging changes relates #142
--HG--
branch : distribute
extra : rebase_source : e912f048dcfe28a5a7a17aca89bab427e15924ff
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() |