diff options
author | Éric Araujo <merwok@netwok.org> | 2011-11-14 18:40:31 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2011-11-14 18:40:31 (GMT) |
commit | e749e21948ceef9ceef755d9b3d1c25c688fdc59 (patch) | |
tree | 1d170494179d3d0d60f2898aacb9d063e10d3132 /Lib/packaging/tests/pypi_server.py | |
parent | 0efc419d4a82f6cb748baf59d1debcd1f933aaa7 (diff) | |
download | cpython-e749e21948ceef9ceef755d9b3d1c25c688fdc59.zip cpython-e749e21948ceef9ceef755d9b3d1c25c688fdc59.tar.gz cpython-e749e21948ceef9ceef755d9b3d1c25c688fdc59.tar.bz2 |
packaging cleanup: A few super I missed in 5ae03b1e147a
Diffstat (limited to 'Lib/packaging/tests/pypi_server.py')
-rw-r--r-- | Lib/packaging/tests/pypi_server.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/packaging/tests/pypi_server.py b/Lib/packaging/tests/pypi_server.py index 377a2b9..13c30cf 100644 --- a/Lib/packaging/tests/pypi_server.py +++ b/Lib/packaging/tests/pypi_server.py @@ -33,7 +33,6 @@ import os import queue import select import threading -import socketserver from functools import wraps from http.server import HTTPServer, SimpleHTTPRequestHandler from xmlrpc.server import SimpleXMLRPCServer @@ -270,7 +269,7 @@ class PyPIRequestHandler(SimpleHTTPRequestHandler): class PyPIXMLRPCServer(SimpleXMLRPCServer): def server_bind(self): """Override server_bind to store the server name.""" - socketserver.TCPServer.server_bind(self) + super(PyPIXMLRPCServer, self).server_bind() host, port = self.socket.getsockname()[:2] self.server_port = port @@ -371,12 +370,13 @@ class MockDist: 'requires_python': self.requires_python, 'classifiers': [], 'name': self.name, - 'licence': self.licence, + 'licence': self.licence, # XXX licence or license? 'summary': self.summary, 'home_page': self.homepage, 'stable_version': self.stable_version, - 'provides_dist': self.provides_dist or "%s (%s)" % (self.name, - self.version), + # FIXME doesn't that reproduce the bug from 6527d3106e9f? + 'provides_dist': (self.provides_dist or + "%s (%s)" % (self.name, self.version)), 'requires': self.requires, 'cheesecake_installability_id': self.cheesecake_installability_id, } |