Patchwork D10873: py3: byteify the version string passed to the deprecation warning method

login
register
mail settings
Submitter phabricator
Date June 12, 2021, 4:57 a.m.
Message ID <differential-rev-PHID-DREV-ziqghecclpu5nvdnbog2-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49196/
State Superseded
Headers show

Comments

phabricator - June 12, 2021, 4:57 a.m.
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The other callers were already correct.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/localrepo.py
  mercurial/ui.py
  mercurial/utils/urlutil.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/utils/urlutil.py b/mercurial/utils/urlutil.py
--- a/mercurial/utils/urlutil.py
+++ b/mercurial/utils/urlutil.py
@@ -688,7 +688,7 @@ 
         path to a repo.
         """
         msg = b'getpath is deprecated, use `get_*` functions from urlutil'
-        ui.deprecwarn(msg, '6.0')
+        ui.deprecwarn(msg, b'6.0')
         # Only fall back to default if no path was requested.
         if name is None:
             if not default:
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1065,7 +1065,7 @@ 
         This method exist as `getpath` need a ui for potential warning message.
         """
         msg = b'ui.getpath is deprecated, use `get_*` functions from urlutil'
-        self.deprecwarn(msg, '6.0')
+        self.deprecwarn(msg, b'6.0')
         return self.paths.getpath(self, *args, **kwargs)
 
     @property
diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2759,7 +2759,7 @@ 
                 "`full` argument for `repo.updatecaches` is deprecated\n"
                 "(use `caches=repository.CACHE_ALL` instead)"
             )
-            self.ui.deprecwarn(msg, "5.9")
+            self.ui.deprecwarn(msg, b"5.9")
             caches = repository.CACHES_ALL
             if full == b"post-clone":
                 caches = repository.CACHES_POST_CLONE