policy: extend API version checks for cffi
authorYuya Nishihara <yuya@tcha.org>
Sun, 28 May 2017 15:45:52 +0900
changeset 32511 2e431fb98c6b
parent 32510 50eaccb8353f
child 32512 0e8b0b9a7acc
policy: extend API version checks for cffi This is just a stub for future extension. I could add a version constant to CFFI modules by putting it to both ffi.set_source() and ffi.cdef(), but that doesn't seem right. So for now, cffi modules will be explicitly unversioned (i.e. version constant must be undefined or set to None.) We can revisit it later when we need to consider CFFI support more seriously.
mercurial/policy.py
--- a/mercurial/policy.py	Sun May 28 17:36:01 2017 +0900
+++ b/mercurial/policy.py	Sun May 28 15:45:52 2017 +0900
@@ -72,16 +72,16 @@
 
 # keep in sync with "version" in C modules
 _cextversions = {
-    r'base85': 1,
-    r'bdiff': 1,
-    r'diffhelpers': 1,
-    r'mpatch': 1,
-    r'osutil': 1,
-    r'parsers': 1,
+    (r'cext', r'base85'): 1,
+    (r'cext', r'bdiff'): 1,
+    (r'cext', r'diffhelpers'): 1,
+    (r'cext', r'mpatch'): 1,
+    (r'cext', r'osutil'): 1,
+    (r'cext', r'parsers'): 1,
 }
 
 def _checkmod(pkgname, modname, mod):
-    expected = _cextversions.get(modname)
+    expected = _cextversions.get((pkgname, modname))
     actual = getattr(mod, r'version', None)
     if actual != expected:
         raise ImportError(r'cannot import module %s.%s '