Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert os.devnull to bytes using pycompat.bytestr
authorPulkit Goyal <7895pulkit@gmail.com>
Tue, 27 Feb 2018 14:42:30 +0530
changeset 36457 0e8b76644e20
parent 36456 9ff5cbfbc26a
child 36458 2218f5bfafca
py3: convert os.devnull to bytes using pycompat.bytestr os.devnull returns str on Python 3. Differential Revision: https://phab.mercurial-scm.org/D2477
hgext/convert/common.py file | annotate | diff | comparison | revisions
mercurial/windows.py file | annotate | diff | comparison | revisions 
--- 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
 
--- 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):
mercurial