Patchwork D7062: convert: convert os.devnull to bytes before trying to join it with other bytes

login
register
mail settings
Submitter phabricator
Date Oct. 11, 2019, 5:13 p.m.
Message ID <differential-rev-PHID-DREV-3jpay3gou4bui5pch5ph-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/42221/
State Superseded
Headers show

Comments

phabricator - Oct. 11, 2019, 5:13 p.m.
Kwan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Together with the previous commit relating to emailparser this gets
  test-convert-tla.t passing under py3.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7062

AFFECTED FILES
  hgext/convert/gnuarch.py

CHANGE DETAILS




To: Kwan, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/convert/gnuarch.py b/hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py
+++ b/hgext/convert/gnuarch.py
@@ -216,7 +216,8 @@ 
         cmdline = [self.execmd, cmd]
         cmdline += args
         cmdline = [procutil.shellquote(arg) for arg in cmdline]
-        cmdline += [b'>', os.devnull, b'2>', os.devnull]
+        bdevnull = pycompat.bytestr(os.devnull)
+        cmdline += [b'>', bdevnull, b'2>', bdevnull]
         cmdline = procutil.quotecommand(b' '.join(cmdline))
         self.ui.debug(cmdline, b'\n')
         return os.system(pycompat.rapply(procutil.tonativestr, cmdline))