Mercurial > hg > mercurial-source

changeset 33151:008d37c4d783

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
base85: switch to policy importer
author Yuya Nishihara <yuya@tcha.org>
date Sat, 13 Aug 2016 12:08:23 +0900
parents a9c71d578a1c
children 3b88a7fa97d8
files contrib/check-py3-compat.py contrib/import-checker.py contrib/wix/dist.wxs mercurial/__init__.py mercurial/base85.c mercurial/cext/base85.c mercurial/debugcommands.py mercurial/util.py setup.py
diffstat 8 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/check-py3-compat.py
+++ b/contrib/check-py3-compat.py
@@ -17,7 +17,6 @@
 
 # Modules that have both Python and C implementations.
 _dualmodules = (
-    'base85.py',
     'bdiff.py',
     'diffhelpers.py',
     'mpatch.py',
--- a/contrib/import-checker.py
+++ b/contrib/import-checker.py
@@ -26,7 +26,6 @@
 
 # Modules that have both Python and C implementations.
 _dualmodules = (
-    'base85.py',
     'bdiff.py',
     'diffhelpers.py',
     'mpatch.py',
--- a/contrib/wix/dist.wxs
+++ b/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" />
--- a/mercurial/__init__.py
+++ b/mercurial/__init__.py
@@ -23,7 +23,6 @@
 # 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',
rename from mercurial/base85.c
rename to mercurial/cext/base85.c
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1026,11 +1026,11 @@
         err = None
         try:
             from . import (
-                base85,
                 bdiff,
                 mpatch,
             )
             from .cext import (
+                base85,
                 osutil,
             )
             dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -42,7 +42,6 @@
 import zlib
 
 from . import (
-    base85,
     encoding,
     error,
     i18n,
@@ -51,6 +50,7 @@
     pycompat,
 )
 
+base85 = policy.importmod(r'base85')
 osutil = policy.importmod(r'osutil')
 
 b85decode = base85.b85decode
--- a/setup.py
+++ b/setup.py
@@ -621,7 +621,7 @@
     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',