# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1519722750 -19800 # Node ID 0e8b76644e20323098a57d5ef9c1715b4355476d # Parent 9ff5cbfbc26accbe9e15475a25f5194a507e82dc py3: convert os.devnull to bytes using pycompat.bytestr os.devnull returns str on Python 3. Differential Revision: https://phab.mercurial-scm.org/D2477 diff -r 9ff5cbfbc26a -r 0e8b76644e20 hgext/convert/common.py --- a/hgext/convert/common.py Tue Feb 27 14:41:24 2018 +0530 +++ b/hgext/convert/common.py Tue Feb 27 14:42:30 2018 +0530 @@ -339,7 +339,7 @@ pass cmdline = [util.shellquote(arg) for arg in cmdline] if not self.ui.debugflag: - cmdline += ['2>', os.devnull] + cmdline += ['2>', pycompat.bytestr(os.devnull)] cmdline = ' '.join(cmdline) return cmdline diff -r 9ff5cbfbc26a -r 0e8b76644e20 mercurial/windows.py --- a/mercurial/windows.py Tue Feb 27 14:41:24 2018 +0530 +++ b/mercurial/windows.py Tue Feb 27 14:42:30 2018 +0530 @@ -316,7 +316,7 @@ # Work around "popen spawned process may not write to stdout # under windows" # http://bugs.python.org/issue1366 - command += " 2> %s" % os.devnull + command += " 2> %s" % pycompat.bytestr(os.devnull) return os.popen(quotecommand(command), mode) def explainexit(code):