Author: Alex Gaynor <alex.gay...@gmail.com>
Branch:
Changeset: r53301:6e9e7188dcaf
Date: 2012-03-11 12:28 -0700
http://bitbucket.org/pypy/pypy/changeset/6e9e7188dcaf/
Log: merged upstream
diff --git a/pypy/objspace/flow/operation.py b/pypy/objspace/flow/operation.py
--- a/pypy/objspace/flow/operation.py
+++ b/pypy/objspace/flow/operation.py
@@ -30,10 +30,7 @@
def new_style_type(x):
"""Simulate a situation where every class is new-style"""
- t = getattr(x, '__class__', type(x))
- if t is types.ClassType: # guess who's here? exception classes...
- t = type
- return t
+ return getattr(x, '__class__', type(x))
def do_int(x):
return x.__int__()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
