From patchwork Wed Mar  8 23:22:46 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [7, of, 8, py3, v3] init: zstd is already python3-ready,
 so don't run it through our importer
From: Augie Fackler <raf@durin42.com>
X-Patchwork-Id: 19036
Message-Id: <eefc1048d292cda28d44.1489015366@augie-macbookair2.roam.corp.google.com>
To: mercurial-devel@mercurial-scm.org
Date: Wed, 08 Mar 2017 18:22:46 -0500

# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1489014679 18000
#      Wed Mar 08 18:11:19 2017 -0500
# Node ID eefc1048d292cda28d4493ac5a6ea56c68fed1e2
# Parent  9788576dc5009344c2649a7a56565cdf20713112
init: zstd is already python3-ready, so don't run it through our importer

diff --git a/mercurial/__init__.py b/mercurial/__init__.py
--- a/mercurial/__init__.py
+++ b/mercurial/__init__.py
@@ -137,6 +137,9 @@ if sys.version_info[0] >= 3:
             # Only handle Mercurial-related modules.
             if not fullname.startswith(('mercurial.', 'hgext.', 'hgext3rd.')):
                 return None
+            # zstd is already dual-version clean, don't try and mangle it
+            if fullname.startswith('mercurial.zstd'):
+                return None
 
             # This assumes Python 3 doesn't support loading C modules.
             if fullname in _dualmodules: