Author: Alex Gaynor <[email protected]>
Branch: split-rpython
Changeset: r60011:3e57ac34033b
Date: 2013-01-12 19:38 -0800
http://bitbucket.org/pypy/pypy/changeset/3e57ac34033b/
Log: merged upstream
diff --git a/goal/targetpypystandalone.py b/goal/targetpypystandalone.py
--- a/goal/targetpypystandalone.py
+++ b/goal/targetpypystandalone.py
@@ -4,9 +4,9 @@
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
-from rpython.translator.goal.ann_override import PyPyAnnotatorPolicy
-from pypy.config.config import Config, to_optparse, make_dict, SUPPRESS_USAGE
-from pypy.config.config import ConflictConfigError
+from pypy.tool.ann_override import PyPyAnnotatorPolicy
+from rpython.config.config import Config, to_optparse, make_dict,
SUPPRESS_USAGE
+from rpython.config.config import ConflictConfigError
from pypy.tool.option import make_objspace
from pypy.conftest import pypydir
diff --git a/goal/ann_override.py b/pypy/tool/ann_override.py
rename from goal/ann_override.py
rename to pypy/tool/ann_override.py
diff --git a/pypy/tool/pypyjit.py b/pypy/tool/pypyjit.py
--- a/pypy/tool/pypyjit.py
+++ b/pypy/tool/pypyjit.py
@@ -98,7 +98,7 @@
code.exec_code(space, w_dict, w_dict)
def test_run_translation():
- from rpython.translator.goal.ann_override import PyPyAnnotatorPolicy
+ from pypy.tool.ann_override import PyPyAnnotatorPolicy
from rpython.rtyper.test.test_llinterp import get_interpreter
# first annotate and rtype
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
