Mercurial > public > mercurial-scm > hg
diff tests/tinyproxy.py @ 29433:33770d2b6cf9
py3: conditionalize SocketServer import
The SocketServer is renamed to socketserver in python 3
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 27 Jun 2016 16:48:54 +0530 |
| parents | 80880ad3fccd |
| children | 143d21a7343e |
line wrap: on
line diff
--- a/tests/tinyproxy.py Mon Jun 27 16:37:37 2016 +0530 +++ b/tests/tinyproxy.py Mon Jun 27 16:48:54 2016 +0530 @@ -15,7 +15,6 @@ __version__ = "0.2.1" import BaseHTTPServer -import SocketServer import os import select import socket @@ -24,6 +23,7 @@ from mercurial import util urlparse = util.urlparse +socketserver = util.socketserver class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler): __base = BaseHTTPServer.BaseHTTPRequestHandler @@ -135,7 +135,7 @@ do_PUT = do_GET do_DELETE = do_GET -class ThreadingHTTPServer (SocketServer.ThreadingMixIn, +class ThreadingHTTPServer (socketserver.ThreadingMixIn, BaseHTTPServer.HTTPServer): def __init__(self, *args, **kwargs): BaseHTTPServer.HTTPServer.__init__(self, *args, **kwargs)