| Alphare |
| hg-reviewers |
The logic here is more complicated than most Python 2/3 support code.
But the rewritten logic should be identical.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/chgserver.py (11 lines) |
| def _restoreio(self): | def _restoreio(self): | ||||
| if not self._oldios: | if not self._oldios: | ||||
| return | return | ||||
| nullfd = os.open(os.devnull, os.O_WRONLY) | nullfd = os.open(os.devnull, os.O_WRONLY) | ||||
| ui = self.ui | ui = self.ui | ||||
| for (ch, fp, fd), (cn, fn, mode) in zip(self._oldios, _iochannels): | for (ch, fp, fd), (cn, fn, mode) in zip(self._oldios, _iochannels): | ||||
| newfp = getattr(ui, fn) | newfp = getattr(ui, fn) | ||||
| # On Python 2, newfp and fp may be separate file objects associated | # On Python 3, newfp is just a wrapper around fp even if newfp is | ||||
| # with the same fd, so we must close newfp while it's associated | # not fp, so deleting newfp is safe. | ||||
| # with the client. Otherwise the new associated fd would be closed | if newfp is not fp: | ||||
| # when newfp gets deleted. On Python 3, newfp is just a wrapper | |||||
| # around fp even if newfp is not fp, so deleting newfp is safe. | |||||
| if not (pycompat.ispy3 or newfp is fp): | |||||
| newfp.close() | newfp.close() | ||||
| # restore original fd: fp is open again | # restore original fd: fp is open again | ||||
| try: | try: | ||||
| if (pycompat.ispy3 or newfp is fp) and 'w' in mode: | if newfp is fp and 'w' in mode: | ||||
| # Discard buffered data which couldn't be flushed because | # Discard buffered data which couldn't be flushed because | ||||
| # of EPIPE. The data should belong to the current session | # of EPIPE. The data should belong to the current session | ||||
| # and should never persist. | # and should never persist. | ||||
| os.dup2(nullfd, fp.fileno()) | os.dup2(nullfd, fp.fileno()) | ||||
| fp.flush() | fp.flush() | ||||
| os.dup2(fd, fp.fileno()) | os.dup2(fd, fp.fileno()) | ||||
| except OSError as err: | except OSError as err: | ||||
| # According to issue6330, running chg on heavy loaded systems | # According to issue6330, running chg on heavy loaded systems | ||||