D12310: charencode: remove Python 2 support code

Submitter	phabricator
Date	March 2, 2022, 11:31 p.m.
Message ID	<differential-rev-PHID-DREV-iy7xmykrtqpufpk7nyuj-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/50649/
State	New
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Wed, 2 Mar 2022 23:31:52 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "indygreg (Gregory Szorc)" <phabricator@mercurial-scm.org> Subject: D12310: charencode: remove Python 2 support code Message-ID: <differential-rev-PHID-DREV-iy7xmykrtqpufpk7nyuj-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-iy7xmykrtqpufpk7nyuj Thread-Index: Mzk4NzgwZjA3NDkzNmY2Mjg2NTMzYWZhOGVk MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "indygreg \(Gregory Szorc\)" <phabricator+D12310+public+4e405d4db34f017e@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, 11:31 p.m.

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/pure/charencode.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/pure/charencode.py b/mercurial/pure/charencode.py
--- a/mercurial/pure/charencode.py
+++ b/mercurial/pure/charencode.py
@@ -67,10 +67,7 @@ 
         raise ValueError
 
 
-if pycompat.ispy3:
-    _utf8strict = r'surrogatepass'
-else:
-    _utf8strict = r'strict'
+_utf8strict = r'surrogatepass'
 
 
 def jsonescapeu8fallback(u8chars, paranoid):

Patchwork D12310: charencode: remove Python 2 support code

Comments

Patch