tor

commit e6366f787c49bebd5faafa1b6f78c81ab463fd08
parent 3c97b148a42f6863ccf4b950967ce345d2fc8cbe
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  3 Jul 2018 09:48:00 -0400

Merge branch 'bug26535_032' into maint-0.3.2

Diffstat:
A
changes/bug26535.032
 | 
5
+++++
M
src/test/hs_ntor_ref.py
 | 
7
+++++--

2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/changes/bug26535.032 b/changes/bug26535.032
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing, compatibility):
+    - When running the hs_ntor_ref.py test, make sure only to pass strings
+      (rather than "bytes" objects) to the Python subprocess module.
+      Python 3 on Windows seems to require this.  Fixes bug 26535; bugfix on
+      0.3.1.1-alpha.
diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py
@@ -234,8 +234,11 @@ Utilities for communicating with the little-t-tor ntor wrapper to conduct the
 integration tests
 """
 
-PROG = b"./src/test/test-hs-ntor-cl"
-enhex=lambda s: binascii.b2a_hex(s)
+PROG = "./src/test/test-hs-ntor-cl"
+if sys.version_info[0] >= 3:
+    enhex=lambda s: binascii.b2a_hex(s).decode("ascii")
+else:
+    enhex=lambda s: binascii.b2a_hex(s)
 dehex=lambda s: binascii.a2b_hex(s.strip())
 
 def tor_client1(intro_auth_pubkey_str, intro_enc_pubkey,