merge 3.4

This commit is contained in:
Benjamin Peterson 2014-04-17 18:29:27 -04:00
commit af7c5b0bb5

View file

@ -81,7 +81,10 @@ class Annotations(dict):
continue continue
if not par[0].has_key('names') or not par[0]['names']: if not par[0].has_key('names') or not par[0]['names']:
continue continue
entry = self.get(par[0]['names'][0]) name = par[0]['names'][0]
if name.startswith("c."):
name = name[2:]
entry = self.get(name)
if not entry: if not entry:
continue continue
elif entry.result_type not in ("PyObject*", "PyVarObject*"): elif entry.result_type not in ("PyObject*", "PyVarObject*"):