Mercurial > hg
diff tests/test-conflict.t @ 35947:a36d3c8a0e41
py3: add b'' prefixes to string literals in test files
# skip-blame because we are just adding b''
Differential Revision: https://phab.mercurial-scm.org/D2075
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 07 Feb 2018 13:34:51 +0530 |
parents | 41ef02ba329b |
children | 80e5210df25c |
line wrap: on
line diff
--- a/tests/test-conflict.t Wed Feb 07 13:21:06 2018 +0530 +++ b/tests/test-conflict.t Wed Feb 07 13:34:51 2018 +0530 @@ -139,8 +139,8 @@ $ hg up -q --clean . $ $PYTHON <<EOF > fp = open('logfile', 'w') - > fp.write('12345678901234567890123456789012345678901234567890' + - > '1234567890') # there are 5 more columns for 80 columns + > fp.write(b'12345678901234567890123456789012345678901234567890' + + > b'1234567890') # there are 5 more columns for 80 columns > > # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes > fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8'))