D2472: pycompat: prevent encoding or decoding values if not required
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Sat Mar 3 14:30:58 EST 2018
durin42 updated this revision to Diff 6449.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2472?vs=6439&id=6449
REVISION DETAIL
https://phab.mercurial-scm.org/D2472
AFFECTED FILES
mercurial/pycompat.py
CHANGE DETAILS
diff --git a/mercurial/pycompat.py b/mercurial/pycompat.py
--- a/mercurial/pycompat.py
+++ b/mercurial/pycompat.py
@@ -192,11 +192,15 @@
def strurl(url):
"""Converts a bytes url back to str"""
- return url.decode(u'ascii')
+ if isinstance(url, bytes):
+ return url.decode(u'ascii')
+ return url
def bytesurl(url):
"""Converts a str url to bytes by encoding in ascii"""
- return url.encode(u'ascii')
+ if isinstance(url, str):
+ return url.encode(u'ascii')
+ return url
def raisewithtb(exc, tb):
"""Raise exception with the given traceback"""
To: pulkit, #hg-reviewers, yuja, durin42
Cc: durin42, indygreg, yuja, mercurial-devel
More information about the Mercurial-devel
mailing list