Patchwork py3: fix a bytes/str mingling in test-install.t

login
register
mail settings
Submitter Matt Harbison
Date Jan. 26, 2019, 3:45 a.m.
Message ID <8b3b641e51f786a056c7.1548474301@Envy>
Download mbox | patch
Permalink /patch/38062/
State Accepted
Headers show

Comments

Matt Harbison - Jan. 26, 2019, 3:45 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1548473565 18000
#      Fri Jan 25 22:32:45 2019 -0500
# Node ID 8b3b641e51f786a056c7478f45560e67356bb35b
# Parent  ffdac0067a147f878ac45dc2c4b3b3e490865252
py3: fix a bytes/str mingling in test-install.t
Yuya Nishihara - Jan. 26, 2019, 4:09 a.m.
On Fri, 25 Jan 2019 22:45:01 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1548473565 18000
> #      Fri Jan 25 22:32:45 2019 -0500
> # Node ID 8b3b641e51f786a056c7478f45560e67356bb35b
> # Parent  ffdac0067a147f878ac45dc2c4b3b3e490865252
> py3: fix a bytes/str mingling in test-install.t

Queued, thanks.

Patch

diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -188,10 +188,9 @@  not found (this is intentionally using b
   >                             stderr=subprocess.PIPE)
   >     output = proc.communicate()[0]
   > 
-  >     slash = '/'
   >     for line in output.splitlines():
   >         if os.name == 'nt':
-  >             yield line.replace(os.sep, slash)
+  >             yield line.replace(pycompat.sysbytes(os.sep), b'/')
   >         else:
   >             yield line
   >