Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r62823:36f286388b05
Date: 2013-03-26 19:30 -0700
http://bitbucket.org/pypy/pypy/changeset/36f286388b05/
Log: typetype was folded into typeobject
diff --git a/pypy/module/__builtin__/compiling.py
b/pypy/module/__builtin__/compiling.py
--- a/pypy/module/__builtin__/compiling.py
+++ b/pypy/module/__builtin__/compiling.py
@@ -116,7 +116,7 @@
if isclass:
# w_meta is really a class, so check for a more derived
# metaclass, or possible metaclass conflicts
- from pypy.objspace.std.typetype import _calculate_metaclass
+ from pypy.objspace.std.typeobject import _calculate_metaclass
w_meta = _calculate_metaclass(space, w_meta, bases_w)
try:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
