[pypy-svn] r37548 - in pypy/dist/pypy/annotation: . test

[ac at codespeak.net]

Author: ac
Date: Mon Jan 29 17:27:34 2007
New Revision: 37548

Modified:
   pypy/dist/pypy/annotation/bookkeeper.py
   pypy/dist/pypy/annotation/test/test_annrpython.py
Log:
(arre, pedronis) now this annotation test passes.



Modified: pypy/dist/pypy/annotation/bookkeeper.py
==============================================================================
--- pypy/dist/pypy/annotation/bookkeeper.py	(original)
+++ pypy/dist/pypy/annotation/bookkeeper.py	Mon Jan 29 17:27:34 2007
@@ -569,7 +569,11 @@
         descs = pbc.descriptions.keys()
         if not descs:
             return s_ImpossibleValue
+
         first = descs[0]
+        if len(descs) == 1:
+            return first.s_read_attribute(attr)
+        
         change = first.mergeattrfamilies(descs[1:], attr)
         attrfamily = first.getattrfamily(attr)
 

Modified: pypy/dist/pypy/annotation/test/test_annrpython.py
==============================================================================
--- pypy/dist/pypy/annotation/test/test_annrpython.py	(original)
+++ pypy/dist/pypy/annotation/test/test_annrpython.py	Mon Jan 29 17:27:34 2007
@@ -860,7 +860,6 @@
         assert dict.fromkeys(acc1.attrs) == {'v1': None, 'v2': None}
 
     def test_single_pbc_getattr(self):
-        py.test.skip("in-progress")
         class C:
             def __init__(self, v1, v2):
                 self.v1 = v1