# HG changeset patch # User Yuya Nishihara # Date 2015-10-03 09:48:21 # Node ID 1a257841868923c92c444a0f551ca56e42c13ef3 # Parent 499d5c98e98b0838207b40da720a30bc0ba70c69 pager: rename variables of backup fds The next patch will add backup file objects, so the original variable names would be confusing. diff --git a/hgext/pager.py b/hgext/pager.py --- a/hgext/pager.py +++ b/hgext/pager.py @@ -70,8 +70,8 @@ def _runpager(ui, p): close_fds=util.closefds, stdin=subprocess.PIPE, stdout=sys.stdout, stderr=sys.stderr) - stdout = os.dup(sys.stdout.fileno()) - stderr = os.dup(sys.stderr.fileno()) + stdoutfd = os.dup(sys.stdout.fileno()) + stderrfd = os.dup(sys.stderr.fileno()) os.dup2(pager.stdin.fileno(), sys.stdout.fileno()) if ui._isatty(sys.stderr): os.dup2(pager.stdin.fileno(), sys.stderr.fileno()) @@ -81,8 +81,8 @@ def _runpager(ui, p): if util.safehasattr(signal, "SIGINT"): signal.signal(signal.SIGINT, signal.SIG_IGN) pager.stdin.close() - os.dup2(stdout, sys.stdout.fileno()) - os.dup2(stderr, sys.stderr.fileno()) + os.dup2(stdoutfd, sys.stdout.fileno()) + os.dup2(stderrfd, sys.stderr.fileno()) pager.wait() def uisetup(ui):