Patchwork [5,of,5,RESEND] windows: do not replace sys.stdout by winstdout

login
register
mail settings
Submitter Yuya Nishihara
Date Nov. 11, 2016, 3:50 p.m.
Message ID <95d7be9da5d1e1b85e3d.1478879424@mimosa>
Download mbox | patch
Permalink /patch/17503/
State Accepted
Headers show

Comments

Yuya Nishihara - Nov. 11, 2016, 3:50 p.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1476975826 -32400
#      Fri Oct 21 00:03:46 2016 +0900
# Node ID 95d7be9da5d1e1b85e3d91d24fe5eb1e1be84857
# Parent  dc7445f35ec687e372f9d27bbbb9bb4c5f0d1641
windows: do not replace sys.stdout by winstdout

Now we use util.stdout everywhere.
Augie Fackler - Nov. 21, 2016, 11:31 p.m.
On Sat, Nov 12, 2016 at 12:50:24AM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1476975826 -32400
> #      Fri Oct 21 00:03:46 2016 +0900
> # Node ID 95d7be9da5d1e1b85e3d91d24fe5eb1e1be84857
> # Parent  dc7445f35ec687e372f9d27bbbb9bb4c5f0d1641
> windows: do not replace sys.stdout by winstdout

These are queued, thanks.

>
> Now we use util.stdout everywhere.
>
> diff --git a/mercurial/windows.py b/mercurial/windows.py
> --- a/mercurial/windows.py
> +++ b/mercurial/windows.py
> @@ -171,8 +171,6 @@ class winstdout(object):
>              self.close()
>              raise IOError(errno.EPIPE, 'Broken pipe')
>
> -sys.stdout = winstdout(sys.stdout)
> -
>  def _is_win_9x():
>      '''return true if run on windows 95, 98 or me.'''
>      try:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/windows.py b/mercurial/windows.py
--- a/mercurial/windows.py
+++ b/mercurial/windows.py
@@ -171,8 +171,6 @@  class winstdout(object):
             self.close()
             raise IOError(errno.EPIPE, 'Broken pipe')
 
-sys.stdout = winstdout(sys.stdout)
-
 def _is_win_9x():
     '''return true if run on windows 95, 98 or me.'''
     try: