[pypy-svn] r7329 - in pypy/trunk/src/pypy/objspace/std: . test

[bob at codespeak.net]

Author: bob
Date: Wed Nov 17 16:32:48 2004
New Revision: 7329

Modified:
   pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py
   pypy/trunk/src/pypy/objspace/std/typetype.py
Log:
doc descriptor, tests



Modified: pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py	(original)
+++ pypy/trunk/src/pypy/objspace/std/test/test_typeobject.py	Wed Nov 17 16:32:48 2004
@@ -185,10 +185,12 @@
             ImmutableDoc.__doc__ = "bar"
         except TypeError:
             pass
+        except AttributeError:
+            print 'XXX - Python raises TypeError for several descriptors, we always raise AttributeError.'
         else:
             raise AssertionError, '__doc__ should not be writable'
 
-        self.assertEquals_(ImmutableDoc.__doc__, 'foo')
+        self.assertEquals(ImmutableDoc.__doc__, 'foo')
 
 
 if __name__ == '__main__':

Modified: pypy/trunk/src/pypy/objspace/std/typetype.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/typetype.py	(original)
+++ pypy/trunk/src/pypy/objspace/std/typetype.py	Wed Nov 17 16:32:48 2004
@@ -38,6 +38,9 @@
     else:
         return space.w_object
 
+def descr__doc(space, w_type):
+    return w_type.dict_w.get('__doc__')
+
 # ____________________________________________________________
 
 type_typedef = StdTypeDef("type",
@@ -47,5 +50,6 @@
     __base__ = GetSetProperty(descr__base),
     __mro__ = GetSetProperty(descr_get__mro__),
     __dict__ = dictproxy_descr,
+    __doc__ = GetSetProperty(descr__doc),
     mro = newmethod(descr_mro),
     )