Author: Matti Picus <[email protected]>
Branch: cpyext-best_base
Changeset: r67267:e409b611cf6d
Date: 2013-10-10 01:05 +0300
http://bitbucket.org/pypy/pypy/changeset/e409b611cf6d/
Log: cleanup
diff --git a/pypy/module/cpyext/typeobject.py b/pypy/module/cpyext/typeobject.py
--- a/pypy/module/cpyext/typeobject.py
+++ b/pypy/module/cpyext/typeobject.py
@@ -574,34 +574,7 @@
def best_base(space, bases_w):
if not bases_w:
return None
-
return find_best_base(space, bases_w)
- w_winner = None
- w_base = None
- for w_base_i in bases_w:
- if isinstance(w_base_i, W_ClassObject):
- # old-style base
- continue
- assert isinstance(w_base_i, W_TypeObject)
- w_candidate = solid_base(space, w_base_i)
- if not w_winner:
- w_winner = w_candidate
- w_base = w_base_i
- elif space.abstract_issubclass_w(w_winner, w_candidate):
- pass
- elif space.abstract_issubclass_w(w_candidate, w_winner):
- w_winner = w_candidate
- w_base = w_base_i
- else:
- raise OperationError(
- space.w_TypeError,
- space.wrap("multiple bases have instance lay-out conflict"))
- if w_base is None:
- raise OperationError(
- space.w_TypeError,
- space.wrap("a new-style class can't have only classic bases"))
-
- return w_base
def inherit_slots(space, pto, w_base):
# XXX missing: nearly everything
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
