[Zope-Checkins] SVN: Zope/trunk/ Merge from 2.8 branch r30675:

[Florent Guillaume]

Log message for revision 30676:
  Merge from 2.8 branch r30675:
  
  Collector #1803: Fixed InitializeClass for some corner case.
  
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/App/class_init.py
  A   Zope/trunk/lib/python/App/tests/test_class_init.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-06-07 13:12:24 UTC (rev 30675)
+++ Zope/trunk/doc/CHANGES.txt	2005-06-07 14:06:28 UTC (rev 30676)
@@ -33,6 +33,9 @@
       - 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.
 	      

Modified: Zope/trunk/lib/python/App/class_init.py
===================================================================
--- Zope/trunk/lib/python/App/class_init.py	2005-06-07 13:12:24 UTC (rev 30675)
+++ Zope/trunk/lib/python/App/class_init.py	2005-06-07 14:06:28 UTC (rev 30676)
@@ -43,8 +43,8 @@
             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):

Copied: Zope/trunk/lib/python/App/tests/test_class_init.py (from rev 30675, Zope/branches/Zope-2_8-branch/lib/python/App/tests/test_class_init.py)