Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch: share-mapdict-methods
Changeset: r83989:c6292a877bc4
Date: 2016-04-27 18:09 +0300
http://bitbucket.org/pypy/pypy/changeset/c6292a877bc4/
Log: don't put anything into __init__.py
diff --git a/pypy/interpreter/test/test_extmodules.py
b/pypy/interpreter/test/test_extmodules.py
--- a/pypy/interpreter/test/test_extmodules.py
+++ b/pypy/interpreter/test/test_extmodules.py
@@ -2,7 +2,7 @@
import pytest
from pypy.config.pypyoption import get_pypy_config
-from pypy.objspace.std import StdObjSpace
+from pypy.objspace.std.objspace import StdObjSpace
from rpython.tool.udir import udir
mod_init = """
diff --git a/pypy/objspace/std/__init__.py b/pypy/objspace/std/__init__.py
--- a/pypy/objspace/std/__init__.py
+++ b/pypy/objspace/std/__init__.py
@@ -1,2 +0,0 @@
-from pypy.objspace.std.objspace import StdObjSpace
-Space = StdObjSpace
diff --git a/pypy/tool/option.py b/pypy/tool/option.py
--- a/pypy/tool/option.py
+++ b/pypy/tool/option.py
@@ -29,7 +29,5 @@
return config
def make_objspace(config):
- mod = __import__('pypy.objspace.std',
- None, None, ['Space'])
- Space = mod.Space
+ from pypy.objspace.std.objspace import StdObjSpace as Space
return Space(config)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
