From patchwork Thu Mar 10 01:08:35 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D12363: pycompat: remove check for Python >= 3.6
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 50705
Message-Id: <differential-rev-PHID-DREV-pgqlry6p6aatpsirruf4-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Thu, 10 Mar 2022 01:08:35 +0000

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

REVISION SUMMARY
  We dropped support for Python 3.5 so this is always true.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/pycompat.py

CHANGE DETAILS




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

diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py
--- a/mercurial/pycompat.py
+++ b/mercurial/pycompat.py
@@ -86,7 +86,7 @@
     return _rapply(f, xs)
 
 
-if os.name == r'nt' and sys.version_info >= (3, 6):
+if os.name == r'nt':
     # MBCS (or ANSI) filesystem encoding must be used as before.
     # Otherwise non-ASCII filenames in existing repositories would be
     # corrupted.
@@ -415,7 +415,6 @@
 
         return json.loads(s, *args, **kwargs)
 
-
 else:
     json_loads = json.loads