More module caching.

diff --git a/Cython/Build/Inline.py b/Cython/Build/Inline.py
index fd0288c7138569064fed9d77b4c039632d7b8901..f50ea99e055d5feccf4951679b896a558c83ec32 100644 (file)
--- a/Cython/Build/Inline.py
+++ b/Cython/Build/Inline.py
@@ -12,6 +12,7 @@ except ImportError:
 from distutils.core import Distribution, Extension
 from distutils.command.build_ext import build_ext
 
+import Cython
 from Cython.Compiler.Main import Context, CompilationOptions, default_options
 
 from Cython.Compiler.ParseTreeTransforms import CythonTransform, SkipDeclarations, AnalyseDeclarationsTransform
@@ -106,8 +107,14 @@ def cython_inline(code,
     arg_names.sort()
     arg_sigs = tuple([(get_type(kwds[arg], ctx), arg) for arg in arg_names])
     key = code, arg_sigs
-    module = _code_cache.get(key)
-    if not module:
+    module_name = _code_cache.get(key)
+    if module_name is None:
+        module_name = "_cython_inline_" + hashlib.md5(code + str(arg_sigs) + Cython.__version__).hexdigest()
+    try:
+        if lib_dir not in sys.path:
+            sys.path.append(lib_dir)
+        __import__(module_name)
+    except ImportError:
         cimports = []
         qualified = re.compile(r'([.\w]+)[.]')
         for type, _ in arg_sigs:
@@ -124,24 +131,21 @@ def __invoke(%(params)s):
         """ % {'cimports': '\n'.join(cimports), 'module_body': module_body, 'params': params, 'func_body': func_body }
         for key, value in literals.items():
             module_code = module_code.replace(key, value)
-        module = "_" + hashlib.md5(code + str(arg_sigs)).hexdigest()
-        pyx_file = os.path.join(tempfile.mkdtemp(), module + '.pyx')
+        pyx_file = os.path.join(tempfile.mkdtemp(), module_name + '.pyx')
         open(pyx_file, 'w').write(module_code)
         extension = Extension(
-            name = module,
+            name = module_name,
             sources = [pyx_file],
             pyrex_include_dirs = include_dirs)
         build_extension = build_ext(Distribution())
         build_extension.finalize_options()
         build_extension.extensions = cythonize([extension])
         build_extension.build_temp = os.path.dirname(pyx_file)
-        if lib_dir not in sys.path:
-            sys.path.append(lib_dir)
         build_extension.build_lib  = lib_dir
         build_extension.run()
-        _code_cache[key] = module
+        _code_cache[key] = module_name
     arg_list = [kwds[arg] for arg in arg_names]
-    return __import__(module).__invoke(*arg_list)
+    return __import__(module_name).__invoke(*arg_list)
 
 non_space = re.compile('[^ ]')
 def strip_common_indent(code):