D5755: wireprotov1server: use binascii.unhexlify

indygreg (Gregory Szorc) phabricator at mercurial-scm.org
Wed Jan 30 16:21:45 EST 2019


This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfb28dc97e38f: wireprotov1server: use binascii.unhexlify (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5755?vs=13584&id=13592

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

AFFECTED FILES
  contrib/python3-whitelist
  mercurial/wireprotov1server.py

CHANGE DETAILS

diff --git a/mercurial/wireprotov1server.py b/mercurial/wireprotov1server.py
--- a/mercurial/wireprotov1server.py
+++ b/mercurial/wireprotov1server.py
@@ -7,6 +7,7 @@
 
 from __future__ import absolute_import
 
+import binascii
 import os
 
 from .i18n import _
@@ -344,7 +345,7 @@
       one specific branch of many.
     """
     def decodehexstring(s):
-        return set([h.decode('hex') for h in s.split(';')])
+        return set([binascii.unhexlify(h) for h in s.split(';')])
 
     manifest = repo.vfs.tryread('pullbundles.manifest')
     if not manifest:
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -504,6 +504,7 @@
 test-progress.t
 test-propertycache.py
 test-pull-branch.t
+test-pull-bundle.t
 test-pull-http.t
 test-pull-permission.t
 test-pull-pull-corruption.t



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


More information about the Mercurial-devel mailing list