[pypy-svn] r38748 - in pypy/dist: lib-python/modified-2.4.1 pypy/module/__builtin__

[arigo at codespeak.net]

Author: arigo
Date: Tue Feb 13 20:24:09 2007
New Revision: 38748

Added:
   pypy/dist/lib-python/modified-2.4.1/doctest.py
      - copied, changed from r38738, pypy/dist/lib-python/2.4.1/doctest.py
Modified:
   pypy/dist/pypy/module/__builtin__/app_descriptor.py
Log:
Revert r38738 (it's not helping) and modify doctest.py instead.


Modified: pypy/dist/pypy/module/__builtin__/app_descriptor.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/app_descriptor.py	(original)
+++ pypy/dist/pypy/module/__builtin__/app_descriptor.py	Tue Feb 13 20:24:09 2007
@@ -30,8 +30,6 @@
     def __get__(self, obj, objtype=None):
         return self._f
 
-staticmethod.__module__ = None
-
 
 class classmethod(object):
     """classmethod(function) -> class method
@@ -65,7 +63,6 @@
 def dummy(): pass
 MethodType = type(dummy.__get__(42))
 del dummy
-classmethod.__module__ = None
 
 # It's difficult to have a class that has both a docstring and a slot called
 # '__doc__', but not impossible...
@@ -145,7 +142,6 @@
         self.fdel(obj)
 
 docstring.capture(property, 'slot__doc__')
-property.__module__ = None
 
 
 # super is a modified version from Guido's tutorial