From c7b3bccdaab158c5f29ddb13b92e8d9d1b4c7bdb Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Mon, 20 Jun 2011 22:55:16 +0100 Subject: Changes to support 2.x and 3.x in the same codebase. --- setuptools/tests/server.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'setuptools/tests/server.py') 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() -- cgit v1.2.1 From 9bddd1834966a845eba5ab82ac1d096782050f85 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Tue, 18 Jun 2013 13:54:35 -0500 Subject: Minor fix previously fixed in a merge --- setuptools/tests/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setuptools/tests/server.py') diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index c7343340..0e7407bb 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -3,7 +3,7 @@ import sys import time import threading -import BaseHTTPServer +from setuptools.compat import BaseHTTPRequestHandler from setuptools.compat import (urllib2, URLError, HTTPServer, SimpleHTTPRequestHandler) @@ -56,7 +56,7 @@ class IndexServer(HTTPServer): port = self.server_port return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port -class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler): +class RequestRecorder(BaseHTTPRequestHandler): def do_GET(self): requests = vars(self.server).setdefault('requests', []) requests.append(self) -- cgit v1.2.1 From dfa1b9d695a99d5e871884251c29e8bed18de6ec Mon Sep 17 00:00:00 2001 From: Vinay Sajip Date: Wed, 10 Oct 2012 10:49:54 +0100 Subject: Fixed some resource leaks. --- setuptools/tests/server.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setuptools/tests/server.py') diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index 0e7407bb..ae2381e3 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -51,6 +51,7 @@ class IndexServer(HTTPServer): # ignore any errors; all that's important is the request pass self.thread.join() + self.socket.close() def base_url(self): port = self.server_port -- cgit v1.2.1