Patchwork D1854: py3: use bytes instead of pycompat.bytestr

login
register
mail settings
Submitter phabricator
Date Jan. 12, 2018, 2:10 p.m.
Message ID <differential-rev-PHID-DREV-dsuvsyei2p4wcpn5e7cw-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/26702/
State Superseded
Headers show

Comments

phabricator - Jan. 12, 2018, 2:10 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Follow up for https://phab.mercurial-scm.org/D1795.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/subrepo.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -389,14 +389,14 @@ 
     if util.safehasattr(repo, '_subparent'):
         source = util.url(repo._subsource)
         if source.isabs():
-            return pycompat.bytestr(source)
+            return bytes(source)
         source.path = posixpath.normpath(source.path)
         parent = _abssource(repo._subparent, push, abort=False)
         if parent:
             parent = util.url(util.pconvert(parent))
             parent.path = posixpath.join(parent.path or '', source.path)
             parent.path = posixpath.normpath(parent.path)
-            return pycompat.bytestr(parent)
+            return bytes(parent)
     else: # recursion reached top repo
         if util.safehasattr(repo, '_subtoppath'):
             return repo._subtoppath