[pypy-svn] r73349 - in pypy/trunk/pypy/annotation: . test
benjamin at codespeak.net
benjamin at codespeak.net
Sun Apr 4 05:56:15 CEST 2010
Author: benjamin
Date: Sun Apr 4 05:56:13 2010
New Revision: 73349
Modified:
pypy/trunk/pypy/annotation/description.py
pypy/trunk/pypy/annotation/test/test_annrpython.py
Log:
revert r74438; not well thought out
Modified: pypy/trunk/pypy/annotation/description.py
==============================================================================
--- pypy/trunk/pypy/annotation/description.py (original)
+++ pypy/trunk/pypy/annotation/description.py Sun Apr 4 05:56:13 2010
@@ -293,8 +293,7 @@
return self.bookkeeper.getmethoddesc(self,
classdef, # originclassdef,
None, # selfclassdef
- name,
- pyobj=self.pyobj)
+ name)
def consider_call_site(bookkeeper, family, descs, args, s_result):
shape = rawshape(args)
@@ -728,8 +727,7 @@
self.originclassdef,
newselfclassdef,
self.name,
- flags,
- self.pyobj)
+ flags)
def consider_call_site(bookkeeper, family, descs, args, s_result):
shape = rawshape(args, nextra=1) # account for the extra 'self'
Modified: pypy/trunk/pypy/annotation/test/test_annrpython.py
==============================================================================
--- pypy/trunk/pypy/annotation/test/test_annrpython.py (original)
+++ pypy/trunk/pypy/annotation/test/test_annrpython.py Sun Apr 4 05:56:13 2010
@@ -1768,22 +1768,6 @@
s = a.build_types(f, [str])
assert s == annmodel.SomeString()
- def test_more_complex_method_hasattr(self):
- class X:
- def m(self):
- return 4
- m.attr = 32
- def f():
- x = X()
- if hasattr(x.m, "attr"):
- return 3
- return 0
- a = self.RPythonAnnotator()
- s = a.build_types(f, [])
- s_res = annmodel.SomeInteger(True)
- s_res.const = 3
- assert s == s_res
-
def test_dont_see_AttributeError_clause(self):
class Stuff:
def _freeze_(self):
More information about the Pypy-commit
mailing list