[pypy-svn] r57460 - in pypy/dist/pypy: tool translator/backendopt

fijal at codespeak.net fijal at codespeak.net
Tue Aug 19 13:01:57 CEST 2008


Author: fijal
Date: Tue Aug 19 13:01:54 2008
New Revision: 57460

Added:
   pypy/dist/pypy/tool/compat.py   (contents, props changed)
Modified:
   pypy/dist/pypy/tool/gcc_cache.py
   pypy/dist/pypy/translator/backendopt/stat.py
   pypy/dist/pypy/translator/backendopt/support.py
Log:
Introduce pypy.tool.compat which handles platform-dependent imports.
Right now it only contains platform-independent md5 import, which fallbacks
to pure-python version.


Added: pypy/dist/pypy/tool/compat.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/tool/compat.py	Tue Aug 19 13:01:54 2008
@@ -0,0 +1,6 @@
+
+try:
+    import md5
+except ImportError:
+    # no _md5 module on this platform
+    from pypy.lib import md5

Modified: pypy/dist/pypy/tool/gcc_cache.py
==============================================================================
--- pypy/dist/pypy/tool/gcc_cache.py	(original)
+++ pypy/dist/pypy/tool/gcc_cache.py	Tue Aug 19 13:01:54 2008
@@ -3,7 +3,7 @@
 from pypy.translator.tool.cbuild import build_executable
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 from pypy.translator.tool.cbuild import CompilationError
-import md5
+from pypy.tool.compat import md5
 import py
 
 cache_dir_root = py.path.local(pypydir).join('_cache').ensure(dir=1)

Modified: pypy/dist/pypy/translator/backendopt/stat.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/stat.py	(original)
+++ pypy/dist/pypy/translator/backendopt/stat.py	Tue Aug 19 13:01:54 2008
@@ -1,5 +1,5 @@
 from pypy.translator.simplify import get_graph
-import md5
+from pypy.tool.compat import md5
 
 def get_statistics(graph, translator, save_per_graph_details=None, ignore_stack_checks=False):
     seen_graphs = {}

Modified: pypy/dist/pypy/translator/backendopt/support.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/support.py	(original)
+++ pypy/dist/pypy/translator/backendopt/support.py	Tue Aug 19 13:01:54 2008
@@ -182,7 +182,7 @@
     return loop
 
 def md5digest(translator):
-    import md5
+    from pypy.tool.compat import md5
     graph2digest = {}
     for graph in translator.graphs:
         m = md5.new()



More information about the Pypy-commit mailing list