# HG changeset patch # User Gregory Szorc # Date 2019-11-02 20:39:23 # Node ID bdebc7b54dcae12e507479b592d2acecbf72cae3 # Parent 8a9e53b974eecdbb12ff74def130e9047bd799bc fsmonitor: make _hashignore compatible with Python 3 The Hasher wants a bytes but we were feeding it a str. Let's use our repr() implementation to return bytes. In addition, the hexdigest() would return a str, which would be compared against a bytes and would always fail. Normalize to bytes so the compare works. Differential Revision: https://phab.mercurial-scm.org/D7209 diff --git a/hgext/fsmonitor/__init__.py b/hgext/fsmonitor/__init__.py --- a/hgext/fsmonitor/__init__.py +++ b/hgext/fsmonitor/__init__.py @@ -236,8 +236,8 @@ def _hashignore(ignore): """ sha1 = hashlib.sha1() - sha1.update(repr(ignore)) - return sha1.hexdigest() + sha1.update(pycompat.byterepr(ignore)) + return pycompat.sysbytes(sha1.hexdigest()) _watchmanencoding = pywatchman.encoding.get_local_encoding()