D297: tests: update duplicateoptions test to use bytestrings everywhere
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Wed Aug 9 14:24:48 UTC 2017
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Test now passes on Python 3.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D297
AFFECTED FILES
tests/test-duplicateoptions.py
CHANGE DETAILS
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 @@
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]:
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list