# HG changeset patch # User Pulkit Goyal # Date 2018-09-04 14:33:22 # Node ID 7450f6500b6eb78e567ea9f55c8b96148fc87c15 # Parent cbfab495dbcfde069e45a2af087c215f1e99097d py3: write the file in str mode in tests/test-rename-merge2.t This is better then converting the value the value of sys.argv to bytes. This makes the test pass on Python 3. Differential Revision: https://phab.mercurial-scm.org/D4457 diff --git a/tests/test-rename-merge2.t b/tests/test-rename-merge2.t --- a/tests/test-rename-merge2.t +++ b/tests/test-rename-merge2.t @@ -3,7 +3,7 @@ $ cd t $ cat < merge > import sys, os - > f = open(sys.argv[1], "wb") + > f = open(sys.argv[1], "w") > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3])) > f.close() > EOF