Mercurial > public > mercurial-scm > hg-stable
diff hgext/chgserver.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 | 247ea0dfdb94 |
| children | 71ed5a3ef8a9 |
line wrap: on
line diff
--- a/hgext/chgserver.py Mon Jun 27 16:37:37 2016 +0530 +++ b/hgext/chgserver.py Mon Jun 27 16:48:54 2016 +0530 @@ -40,7 +40,6 @@ from __future__ import absolute_import -import SocketServer import errno import gc import hashlib @@ -68,6 +67,8 @@ util, ) +socketserver = util.socketserver + # Note for extension authors: ONLY specify testedwith = 'internal' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or @@ -530,7 +531,7 @@ 'setumask': setumask}) # copied from mercurial/commandserver.py -class _requesthandler(SocketServer.StreamRequestHandler): +class _requesthandler(socketserver.StreamRequestHandler): def handle(self): # use a different process group from the master process, making this # process pass kernel "is_current_pgrp_orphaned" check so signals like @@ -603,7 +604,7 @@ def process_request(self, request, address): self.lastactive = time.time() - return SocketServer.ForkingMixIn.process_request( + return socketserver.ForkingMixIn.process_request( self, request, address) def server_bind(self): @@ -656,8 +657,8 @@ self.repo = None self._inithashstate() self._checkextensions() - class cls(AutoExitMixIn, SocketServer.ForkingMixIn, - SocketServer.UnixStreamServer): + class cls(AutoExitMixIn, socketserver.ForkingMixIn, + socketserver.UnixStreamServer): ui = self.ui repo = self.repo hashstate = self.hashstate