Patchwork D7621: pycompat: allow pycompat.sysbytes() even if input already is bytes

login
register
mail settings
Submitter phabricator
Date Dec. 12, 2019, 11:44 p.m.
Message ID <differential-rev-PHID-DREV-kpn3mulkbka6g3ztxtfw-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/43763/
State Superseded
Headers show

Comments

phabricator - Dec. 12, 2019, 11:44 p.m.
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  pycompat.sysstr() on py3 accepts an input that's already str
  (i.e. unicode). This patch makes it so pycompat.sysbytes() on py3
  accepts an input that's already bytes. Allowing that makes it possible
  to do pycompat.sysbytes(fp.name) where fp.name is either bytes or
  unicode, as we'll get when fp can come from either open() or
  resources.open_binary().

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/pycompat.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py
--- a/mercurial/pycompat.py
+++ b/mercurial/pycompat.py
@@ -253,6 +253,8 @@ 
         This never raises UnicodeEncodeError, but only ASCII characters
         can be round-trip by sysstr(sysbytes(s)).
         """
+        if isinstance(s, bytes):
+            return s
         return s.encode('utf-8')
 
     def sysstr(s):