From ed54215c1ca6be3874ad8d861b8514dc3009bbb4 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 1 Jan 2015 17:02:09 -0500 Subject: Use serve_forever and shutdown, now available. --- setuptools/tests/server.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'setuptools/tests/server.py') diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index ae2381e3..266ee5bd 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -23,12 +23,8 @@ class IndexServer(HTTPServer): HTTPServer.__init__(self, server_address, RequestHandlerClass) self._run = True - def serve(self): - while self._run: - self.handle_request() - def start(self): - self.thread = threading.Thread(target=self.serve) + self.thread = threading.Thread(target=self.serve_forever) self.thread.start() def stop(self): @@ -37,19 +33,7 @@ class IndexServer(HTTPServer): # Let the server finish the last request and wait for a new one. time.sleep(0.1) - # self.shutdown is not supported on python < 2.6, so just - # set _run to false, and make a request, causing it to - # terminate. - self._run = False - url = 'http://127.0.0.1:%(server_port)s/' % vars(self) - try: - if sys.version_info >= (2, 6): - urllib2.urlopen(url, timeout=5) - else: - urllib2.urlopen(url) - except URLError: - # ignore any errors; all that's important is the request - pass + self.shutdown() self.thread.join() self.socket.close() -- cgit v1.2.3 From 9f6d874dfc15a4d695dbed3ffa9bd3ed56008350 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 1 Jan 2015 17:03:21 -0500 Subject: Use property --- setuptools/tests/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/tests/server.py') diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index 266ee5bd..b53168d1 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -61,6 +61,6 @@ class MockServer(HTTPServer, threading.Thread): def run(self): self.serve_forever() + @property def url(self): return 'http://localhost:%(server_port)s/' % vars(self) - url = property(url) -- cgit v1.2.3 From d4411774ba9ee79480c8128b4e8f610481a65cf3 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 1 Jan 2015 17:03:42 -0500 Subject: Remove unused imports --- setuptools/tests/server.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'setuptools/tests/server.py') diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index b53168d1..6b214279 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -1,11 +1,10 @@ """Basic http server for tests to simulate PyPI or custom indexes """ -import sys + import time import threading from setuptools.compat import BaseHTTPRequestHandler -from setuptools.compat import (urllib2, URLError, HTTPServer, - SimpleHTTPRequestHandler) +from setuptools.compat import HTTPServer, SimpleHTTPRequestHandler class IndexServer(HTTPServer): """Basic single-threaded http server simulating a package index -- cgit v1.2.3