From patchwork Sun Feb 11 22:57:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D2145: py3: port ext-phase-report.py extension From: phabricator X-Patchwork-Id: 27589 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Sun, 11 Feb 2018 22:57:50 +0000 indygreg created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The custom module importer doesn't run on Python files in the tests directory. So we need the source to be compatible with both Python 2 and 3. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2145 AFFECTED FILES tests/testlib/ext-phase-report.py CHANGE DETAILS To: indygreg, #hg-reviewers Cc: mercurial-devel diff --git a/tests/testlib/ext-phase-report.py b/tests/testlib/ext-phase-report.py --- a/tests/testlib/ext-phase-report.py +++ b/tests/testlib/ext-phase-report.py @@ -5,18 +5,18 @@ def reposetup(ui, repo): def reportphasemove(tr): - for rev, move in sorted(tr.changes['phases'].iteritems()): + for rev, move in sorted(tr.changes[b'phases'].items()): if move[0] is None: - ui.write(('test-debug-phase: new rev %d: x -> %d\n' + ui.write((b'test-debug-phase: new rev %d: x -> %d\n' % (rev, move[1]))) else: - ui.write(('test-debug-phase: move rev %d: %s -> %d\n' + ui.write((b'test-debug-phase: move rev %d: %d -> %d\n' % (rev, move[0], move[1]))) class reportphaserepo(repo.__class__): def transaction(self, *args, **kwargs): tr = super(reportphaserepo, self).transaction(*args, **kwargs) - tr.addpostclose('report-phase', reportphasemove) + tr.addpostclose(b'report-phase', reportphasemove) return tr repo.__class__ = reportphaserepo