base85: switch to policy importer

contrib/check-py3-compat.py

@@ -17,7 +17,6 import traceback
 
 # Modules that have both Python and C implementations.
 _dualmodules = (
-    'base85.py',
     'bdiff.py',
     'diffhelpers.py',
     'mpatch.py',

contrib/import-checker.py

@@ -26,7 +26,6 allowsymbolimports = (
 
 # Modules that have both Python and C implementations.
 _dualmodules = (
-    'base85.py',
     'bdiff.py',
     'diffhelpers.py',
     'mpatch.py',

contrib/wix/dist.wxs

@@ -12,7 +12,7
       <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib">
         <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'>
           <File Name="library.zip" KeyPath="yes" />
-          <File Name="mercurial.base85.pyd" />
+          <File Name="mercurial.cext.base85.pyd" />
           <File Name="mercurial.bdiff.pyd" />
           <File Name="mercurial.diffhelpers.pyd" />
           <File Name="mercurial.mpatch.pyd" />

mercurial/__init__.py

@@ -23,7 +23,6 modulepolicy = policy.policy
 # Modules that have both Python and C implementations. See also the
 # set of .py files under mercurial/pure/.
 _dualmodules = {
-    'mercurial.base85',
     'mercurial.bdiff',
     'mercurial.diffhelpers',
     'mercurial.mpatch',

mercurial/debugcommands.py

@@ -1026,11 +1026,11 def debuginstall(ui, **opts):
         err = None
         try:
             from . import (
-                base85,
                 bdiff,
                 mpatch,
             )
             from .cext import (
+                base85,
                 osutil,
             )
             dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes

mercurial/util.py

@@ -42,7 +42,6 import warnings
 import zlib
 
 from . import (
-    base85,
     encoding,
     error,
     i18n,
@@ -51,6 +50,7 from . import (
     pycompat,
 )
 
+base85 = policy.importmod(r'base85')
 osutil = policy.importmod(r'osutil')
 
 b85decode = base85.b85decode

setup.py

@@ -621,7 +621,7 if sys.platform == 'darwin':
     osutil_ldflags += ['-framework', 'ApplicationServices']
 
 extmodules = [
-    Extension('mercurial.base85', ['mercurial/base85.c'],
+    Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'],
               include_dirs=common_include_dirs,
               depends=common_depends),
     Extension('mercurial.bdiff', ['mercurial/bdiff.c',