Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commandserver.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 | d269e7db2f55 |
| children | 540c01a18bb7 |
line wrap: on
line diff
--- a/mercurial/commandserver.py Mon Jun 27 16:37:37 2016 +0530 +++ b/mercurial/commandserver.py Mon Jun 27 16:48:54 2016 +0530 @@ -7,7 +7,6 @@ from __future__ import absolute_import -import SocketServer import errno import os import struct @@ -21,6 +20,8 @@ util, ) +socketserver = util.socketserver + logfile = None def log(*args): @@ -330,7 +331,7 @@ finally: _restoreio(ui, fin, fout) -class _requesthandler(SocketServer.StreamRequestHandler): +class _requesthandler(socketserver.StreamRequestHandler): def handle(self): ui = self.server.ui repo = self.server.repo @@ -366,13 +367,13 @@ self.ui = ui self.repo = repo self.address = opts['address'] - if not util.safehasattr(SocketServer, 'UnixStreamServer'): + if not util.safehasattr(socketserver, 'UnixStreamServer'): raise error.Abort(_('unsupported platform')) if not self.address: raise error.Abort(_('no socket path specified with --address')) def init(self): - class cls(SocketServer.ForkingMixIn, SocketServer.UnixStreamServer): + class cls(socketserver.ForkingMixIn, socketserver.UnixStreamServer): ui = self.ui repo = self.repo self.server = cls(self.address, _requesthandler)