# HG changeset patch # User Martin Geisler # Date 1241883177 -7200 # Node ID f55869abb5c3ab8b9ec610a5f20aedd433c0215a # Parent 44e9771746b97250b1427ec6bf90ef37c689809d util: remove ignored mode argument in popen[23] diff -r 44e9771746b9 -r f55869abb5c3 hgext/convert/cvs.py --- a/hgext/convert/cvs.py Sat May 09 17:12:39 2009 +0200 +++ b/hgext/convert/cvs.py Sat May 09 17:32:57 2009 +0200 @@ -267,7 +267,7 @@ # popen2 does not support argument lists under Windows cmd = [util.shellquote(arg) for arg in cmd] cmd = util.quotecommand(' '.join(cmd)) - self.writep, self.readp = util.popen2(cmd, 'b') + self.writep, self.readp = util.popen2(cmd) self.realroot = root diff -r 44e9771746b9 -r f55869abb5c3 hgext/convert/subversion.py --- a/hgext/convert/subversion.py Sat May 09 17:12:39 2009 +0200 +++ b/hgext/convert/subversion.py Sat May 09 17:32:57 2009 +0200 @@ -987,7 +987,7 @@ arg = encodeargs(args) hgexe = util.hgexecutable() cmd = '%s debugsvnlog' % util.shellquote(hgexe) - stdin, stdout = util.popen2(cmd, 'b') + stdin, stdout = util.popen2(cmd) stdin.write(arg) stdin.close() return logstream(stdout) diff -r 44e9771746b9 -r f55869abb5c3 mercurial/sshrepo.py --- a/mercurial/sshrepo.py Sat May 09 17:12:39 2009 +0200 +++ b/mercurial/sshrepo.py Sat May 09 17:32:57 2009 +0200 @@ -62,7 +62,7 @@ cmd = util.quotecommand(cmd) ui.note(_('running %s\n') % cmd) - self.pipeo, self.pipei, self.pipee = util.popen3(cmd, 'b') + self.pipeo, self.pipei, self.pipee = util.popen3(cmd) # skip any noise generated by remote shell self.do_cmd("hello") diff -r 44e9771746b9 -r f55869abb5c3 mercurial/util.py --- a/mercurial/util.py Sat May 09 17:12:39 2009 +0200 +++ b/mercurial/util.py Sat May 09 17:32:57 2009 +0200 @@ -38,12 +38,12 @@ import subprocess closefds = os.name == 'posix' -def popen2(cmd, mode='t', bufsize=-1): +def popen2(cmd, bufsize=-1): p = subprocess.Popen(cmd, shell=True, bufsize=bufsize, close_fds=closefds, stdin=subprocess.PIPE, stdout=subprocess.PIPE) return p.stdin, p.stdout -def popen3(cmd, mode='t', bufsize=-1): +def popen3(cmd, bufsize=-1): p = subprocess.Popen(cmd, shell=True, bufsize=bufsize, close_fds=closefds, stdin=subprocess.PIPE, stdout=subprocess.PIPE,