D12237: tests: unconditionalize _unified_diff

Submitter	phabricator
Date	March 2, 2022, 12:38 a.m.
Message ID	<differential-rev-PHID-DREV-e7earozq6d6ibqi626gw-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/50577/
State	New
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Wed, 2 Mar 2022 00:38:46 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D12237: tests: unconditionalize _unified_diff Message-ID: <differential-rev-PHID-DREV-e7earozq6d6ibqi626gw-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-e7earozq6d6ibqi626gw Thread-Index: NWYwMzc0MTQ2NGVlNzhlYjgzNWU0MmVjNmRm MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D12237+public+eec3be1aba6b2130@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - March 2, 2022, 12:38 a.m.

indygreg created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Now that we're Python 3 only we can make this logic simpler.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12237

AFFECTED FILES
  tests/run-tests.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -52,6 +52,7 @@ 
 import difflib
 import distutils.version as version
 import errno
+import functools
 import json
 import multiprocessing
 import os
@@ -879,11 +880,7 @@ 
                 pass
 
 
-_unified_diff = difflib.unified_diff
-if PYTHON3:
-    import functools
-
-    _unified_diff = functools.partial(difflib.diff_bytes, difflib.unified_diff)
+_unified_diff = functools.partial(difflib.diff_bytes, difflib.unified_diff)
 
 
 def getdiff(expected, output, ref, err):

Patchwork D12237: tests: unconditionalize _unified_diff

Comments

Patch