Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: kill-faking
Changeset: r59283:df0d942ac4a6
Date: 2012-12-02 17:17 -0800
http://bitbucket.org/pypy/pypy/changeset/df0d942ac4a6/
Log: kill some left over faking stuff
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -509,15 +509,10 @@
for name, w_type in types_w:
self.setitem(self.builtin.w_dict, self.wrap(name), w_type)
- # install mixed and faked modules
+ # install mixed modules
for mixedname in self.get_builtinmodule_to_install():
- if (mixedname not in bootstrap_modules
- and not mixedname.startswith('faked+')):
+ if mixedname not in bootstrap_modules:
self.install_mixedmodule(mixedname, installed_builtin_modules)
- for mixedname in self.get_builtinmodule_to_install():
- if mixedname.startswith('faked+'):
- modname = mixedname[6:]
- self.install_faked_module(modname, installed_builtin_modules)
installed_builtin_modules.sort()
w_builtin_module_names = self.newtuple(
@@ -560,19 +555,6 @@
cpy_module = __import__(modname, {}, {}, ['*'])
return cpy_module
- def install_faked_module(self, modname, installed_builtin_modules):
- """NOT_RPYTHON"""
- if modname in installed_builtin_modules:
- return
- try:
- module = self.load_cpython_module(modname)
- except ImportError:
- return
- else:
- w_modules = self.sys.get('modules')
- self.setitem(w_modules, self.wrap(modname), self.wrap(module))
- installed_builtin_modules.append(modname)
-
def setup_builtin_modules(self):
"NOT_RPYTHON: only for initializing the space."
if self.config.objspace.usemodules.cpyext:
diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -32,8 +32,6 @@
self.rawdict = {}
self.acceptable_as_base_class = '__new__' in rawdict
self.applevel_subclasses_base = None
- # xxx used by faking
- self.fakedcpytype = None
self.add_entries(**rawdict)
assert __total_ordering__ in (None, 'auto'), "Unknown value for
__total_ordering"
if __total_ordering__ == 'auto':
diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -469,8 +469,6 @@
return W_DictMultiObject(space, strategy, storage)
def unwrap(w_self, space):
- if w_self.instancetypedef.fakedcpytype is not None:
- return w_self.instancetypedef.fakedcpytype
from pypy.objspace.std.model import UnwrapError
raise UnwrapError(w_self)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
