Author: Alexander Hesse <[email protected]>
Branch: split-rpython
Changeset: r59876:b4a8a57e8427
Date: 2013-01-08 19:00 +0100
http://bitbucket.org/pypy/pypy/changeset/b4a8a57e8427/
Log: Removed rpython.tool.compat, moved test_annmm to
pypy.objspace.std.test
diff --git a/rpython/annotator/test/test_annmm.py
b/pypy/objspace/std/test/test_annmm.py
rename from rpython/annotator/test/test_annmm.py
rename to pypy/objspace/std/test/test_annmm.py
diff --git a/rpython/jit/tl/jittest.py b/rpython/jit/tl/jittest.py
--- a/rpython/jit/tl/jittest.py
+++ b/rpython/jit/tl/jittest.py
@@ -1,5 +1,5 @@
"""
-This file is imported by pypy.translation.driver when running the
+This file is imported by rpython.translator.driver when running the
target --jittest. Feel free to hack it as needed; it is imported
only after the '---> Checkpoint' fork.
"""
diff --git a/rpython/tool/compat.py b/rpython/tool/compat.py
deleted file mode 100644
--- a/rpython/tool/compat.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-try:
- # Preferred way since python 2.6
- from hashlib import md5
-except ImportError:
- try:
- from md5 import md5
- except ImportError:
- # no _md5 module on this platform. Try hard to find a pure-python one
- # by fishing it from lib_pypy
- from pypy.tool.lib_pypy import import_from_lib_pypy
- md5 = import_from_lib_pypy('md5')
- del import_from_lib_pypy
diff --git a/rpython/tool/gcc_cache.py b/rpython/tool/gcc_cache.py
--- a/rpython/tool/gcc_cache.py
+++ b/rpython/tool/gcc_cache.py
@@ -1,7 +1,7 @@
from pypy.conftest import pypydir
from rpython.translator.platform import CompilationError
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from rpython.tool.compat import md5
+from hashlib import md5
import py
cache_dir_root = py.path.local(pypydir).join('_cache').ensure(dir=1)
diff --git a/rpython/translator/backendopt/stat.py
b/rpython/translator/backendopt/stat.py
--- a/rpython/translator/backendopt/stat.py
+++ b/rpython/translator/backendopt/stat.py
@@ -1,5 +1,5 @@
from rpython.translator.simplify import get_graph
-from rpython.tool.compat import md5
+from hashlib import md5
def get_statistics(graph, translator, save_per_graph_details=None,
ignore_stack_checks=False):
seen_graphs = {}
diff --git a/rpython/translator/backendopt/support.py
b/rpython/translator/backendopt/support.py
--- a/rpython/translator/backendopt/support.py
+++ b/rpython/translator/backendopt/support.py
@@ -116,7 +116,7 @@
return loop
def md5digest(translator):
- from rpython.tool.compat import md5
+ from hashlib import md5
graph2digest = {}
for graph in translator.graphs:
m = md5()
diff --git a/rpython/translator/driver.py b/rpython/translator/driver.py
--- a/rpython/translator/driver.py
+++ b/rpython/translator/driver.py
@@ -395,7 +395,7 @@
# print a message, and restart
from rpython.translator.goal import unixcheckpoint
unixcheckpoint.restartable_point(auto='run')
- # load the module pypy/jit/tl/jittest.py, which you can hack at
+ # load the module rpython/jit/tl/jittest.py, which you can hack at
# and restart without needing to restart the whole translation process
from rpython.jit.tl import jittest
jittest.jittest(self)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
