# HG changeset patch # User Augie Fackler # Date 2017-07-26 02:53:44 # Node ID 5b2f331d0a33772ad22f4fa53b4de38a4ac8887f # Parent 62fbe95075d3439d101b1a4a89c4503560b13a31 tests: update duplicateoptions test to use bytestrings everywhere Test now passes on Python 3. Differential Revision: https://phab.mercurial-scm.org/D297 diff --git a/tests/test-duplicateoptions.py b/tests/test-duplicateoptions.py --- a/tests/test-duplicateoptions.py +++ b/tests/test-duplicateoptions.py @@ -6,18 +6,18 @@ from mercurial import ( 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 @@ for option in commands.globalopts: 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]: