Mercurial > public > mercurial-scm > hg-stable
diff mercurial/chgserver.py @ 32248:d74b0cff94a9
osutil: proxy through util (and platform) modules (API)
See the previous commit for why. Marked as API change since osutil.listdir()
seems widely used in third-party extensions.
The win32mbcs extension is updated to wrap both util. and windows. aliases.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 26 Apr 2017 22:26:28 +0900 |
| parents | e518192d6bac |
| children | c8b9943c07eb |
line wrap: on
line diff
--- a/mercurial/chgserver.py Wed Apr 26 22:05:59 2017 +0900 +++ b/mercurial/chgserver.py Wed Apr 26 22:26:28 2017 +0900 @@ -54,7 +54,6 @@ encoding, error, extensions, - osutil, pycompat, util, ) @@ -313,7 +312,7 @@ # tell client to sendmsg() with 1-byte payload, which makes it # distinctive from "attachio\n" command consumed by client.read() self.clientsock.sendall(struct.pack('>cI', 'I', 1)) - clientfds = osutil.recvfds(self.clientsock.fileno()) + clientfds = util.recvfds(self.clientsock.fileno()) _log('received fds: %r\n' % clientfds) ui = self.ui @@ -458,12 +457,12 @@ 'setenv': setenv, 'setumask': setumask}) - if util.safehasattr(osutil, 'setprocname'): + if util.safehasattr(util, 'setprocname'): def setprocname(self): """Change process title""" name = self._readstr() _log('setprocname: %r\n' % name) - osutil.setprocname(name) + util.setprocname(name) capabilities['setprocname'] = setprocname def _tempaddress(address):