diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-04-08 00:29:34 +0000 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-04-08 00:29:34 +0000 |
| commit | 1b9b6071393b5b40921c0f6bbf95fcceed8029d4 (patch) | |
| tree | 907f1d20acaa891739de2426895280c66c43da21 | |
| parent | 94f0f93eb75b4ad956a1a1d602cfcc2405268b9d (diff) | |
| download | external_python_setuptools-1b9b6071393b5b40921c0f6bbf95fcceed8029d4.tar.gz external_python_setuptools-1b9b6071393b5b40921c0f6bbf95fcceed8029d4.tar.bz2 external_python_setuptools-1b9b6071393b5b40921c0f6bbf95fcceed8029d4.zip | |
Fixed two issues for Python 2.4 compatibility. Tests now run again on Python 2.40.6.26
--HG--
branch : distribute
extra : rebase_source : c6dc5ce8070ec42190d4d8eb6af28523d447f962
| -rw-r--r-- | setuptools/tests/server.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index 6b9fe6ac..7b5cacb9 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -67,7 +67,7 @@ class MockServer(HTTPServer, threading.Thread): RequestHandlerClass=RequestRecorder): HTTPServer.__init__(self, server_address, RequestHandlerClass) threading.Thread.__init__(self) - self.daemon = True + self.setDaemon(True) self.requests = [] def run(self): diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 9cf3441d..3f9b7724 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -273,7 +273,8 @@ class TestSetupRequires(unittest.TestCase): # set up a server which will simulate an alternate package index. p_index = setuptools.tests.server.MockServer() p_index.start() - p_index_loc = urlparse.urlparse(p_index.url).netloc + netloc = 1 + p_index_loc = urlparse.urlparse(p_index.url)[netloc] # I realize this is all-but-impossible to read, because it was # ported from some well-factored, safe code using 'with'. If you |