# HG changeset patch # User Augie Fackler # Date 2017-05-28 19:45:47 # Node ID 942051a29fb621de654a9f4ee97fe039143fe276 # Parent dc0da9829c2972e1c97e07428d6885c1cd4b8f1f loader: pywatchman appears to already be py3 compatible Our loader was doing some confusing things in pywatchman, but it looks like we shouldn't be using it there anyway. diff --git a/mercurial/__init__.py b/mercurial/__init__.py --- a/mercurial/__init__.py +++ b/mercurial/__init__.py @@ -34,6 +34,9 @@ if sys.version_info[0] >= 3: # zstd is already dual-version clean, don't try and mangle it if fullname.startswith('mercurial.zstd'): return None + # pywatchman is already dual-version clean, don't try and mangle it + if fullname.startswith('hgext.fsmonitor.pywatchman'): + return None # Try to find the module using other registered finders. spec = None