Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r49068:1428f8ab1883
Date: 2011-11-09 17:42 -0500
http://bitbucket.org/pypy/pypy/changeset/1428f8ab1883/
Log: fix for a typo and cpyext
diff --git a/pypy/module/cpyext/pyobject.py b/pypy/module/cpyext/pyobject.py
--- a/pypy/module/cpyext/pyobject.py
+++ b/pypy/module/cpyext/pyobject.py
@@ -116,8 +116,8 @@
try:
return typedescr_cache[typedef]
except KeyError:
- if typedef.base is not None:
- return _get_typedescr_1(typedef.base)
+ if typedef.bases:
+ return _get_typedescr_1(typedef.bases[0])
return typedescr_cache[None]
def get_typedescr(typedef):
diff --git a/pypy/objspace/std/stdtypedef.py b/pypy/objspace/std/stdtypedef.py
--- a/pypy/objspace/std/stdtypedef.py
+++ b/pypy/objspace/std/stdtypedef.py
@@ -37,7 +37,7 @@
if a is b:
return True
for a1 in a.bases:
- if issubtypedef(a1, b1):
+ if issubtypedef(a1, b):
return True
return False
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
