diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2011-06-20 22:55:16 +0100 |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2011-06-20 22:55:16 +0100 |
| commit | 58a658b26d1c95b31d02050dcccd648d2e4ce27b (patch) | |
| tree | b9d3e7de6f6d23b91a7afecde3491e99d8cc7069 /setuptools/tests/server.py | |
| parent | e63f3e7d864b26529d6b197e053b4084be20decf (diff) | |
| download | external_python_setuptools-58a658b26d1c95b31d02050dcccd648d2e4ce27b.tar.gz external_python_setuptools-58a658b26d1c95b31d02050dcccd648d2e4ce27b.tar.bz2 external_python_setuptools-58a658b26d1c95b31d02050dcccd648d2e4ce27b.zip | |
Changes to support 2.x and 3.x in the same codebase.
--HG--
branch : distribute
extra : rebase_source : 7d3608edee54a43789f0574d702fb839628b5071
Diffstat (limited to 'setuptools/tests/server.py')
| -rw-r--r-- | setuptools/tests/server.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index f4aaaa1c..c70fab7b 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -1,10 +1,9 @@ """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 +from setuptools.compat import (urllib2, URLError, HTTPServer, + SimpleHTTPRequestHandler) class IndexServer(HTTPServer): """Basic single-threaded http server simulating a package index @@ -39,7 +38,7 @@ class IndexServer(HTTPServer): None, 5) else: urllib2.urlopen('http://127.0.0.1:%s/' % self.server_port) - except urllib2.URLError: + except URLError: pass self.thread.join() |