Mercurial > hg-stable
changeset 33749:5b2f331d0a33
tests: update duplicateoptions test to use bytestrings everywhere
Test now passes on Python 3.
Differential Revision: https://phab.mercurial-scm.org/D297
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 25 Jul 2017 22:53:44 -0400 |
| parents | 62fbe95075d3 |
| children | 6626d12e7a85 |
| files | tests/test-duplicateoptions.py |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-duplicateoptions.py Tue Jul 25 22:48:46 2017 -0400 +++ b/tests/test-duplicateoptions.py Tue Jul 25 22:53:44 2017 -0400 @@ -6,18 +6,18 @@ ui as uimod, ) -ignore = {'highlight', 'win32text', 'factotum'} +ignore = {b'highlight', b'win32text', b'factotum'} if os.name != 'nt': - ignore.add('win32mbcs') + ignore.add(b'win32mbcs') disabled = [ext for ext in extensions.disabled().keys() if ext not in ignore] -hgrc = open(os.environ["HGRCPATH"], 'w') -hgrc.write('[extensions]\n') +hgrc = open(os.environ["HGRCPATH"], 'wb') +hgrc.write(b'[extensions]\n') for ext in disabled: - hgrc.write(ext + '=\n') + hgrc.write(ext + b'=\n') hgrc.close() @@ -30,7 +30,7 @@ option[0] and globalshort.add(option[0]) option[1] and globallong.add(option[1]) -for cmd, entry in commands.table.iteritems(): +for cmd, entry in commands.table.items(): seenshort = globalshort.copy() seenlong = globallong.copy() for option in entry[1]: