Merge from 2.8 branch r30675:

Collector #1803: Fixed InitializeClass for some corner case.

doc/CHANGES.txt

@@ -33,6 +33,9 @@ Zope Changes
       - Included BTreeFolder2
 
     Bugs fixed
+
+      - Collector #1803: Fixed InitializeClass for some corner case.
+
       - Collector #1798, issue1: ZopeTestCase no longer tries to 
         install products that was installed by Zope during startup.
 	      

lib/python/App/class_init.py

@@ -43,8 +43,8 @@ def default__class_init__(self):
             else:
                 # Supply a name implicitly so that the method can
                 # find the security assertions on its container.
-                d['_implicit__name__'] = 1
-                d['__name__']=name
+                v._implicit__name__ = 1
+                v.__name__ = name
             if name=='manage' or name[:7]=='manage_':
                 name=name+'__roles__'
                 if not have(name):

lib/python/App/tests/test_class_init.py

+##############################################################################
+#
+# Copyright (c) 2005 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Tests class initialization.
+"""
+
+import ExtensionClass
+from App.class_init import default__class_init__ as InitializeClass
+
+
+def test_InitializeClass():
+    """Test that InitializeClass (default__class_init__)
+    works in specific corner cases.
+
+    Check when the class has an ExtensionClass as attribute.
+
+    >>> class AnotherClass(ExtensionClass.Base):
+    ...     _need__name__ = 1
+
+    >>> class C:
+    ...     foo = AnotherClass
+
+    >>> InitializeClass(C)
+    """
+
+from zope.testing.doctest import DocTestSuite
+import unittest
+
+def test_suite():
+    return unittest.TestSuite((
+        DocTestSuite(),
+        ))
+
+if __name__ == '__main__':
+    unittest.main()