[Zope-Checkins] SVN: Zope/trunk/src/Zope2/App/startup.py Merge Zope/branches/2.13 121929

[Jamie Lentin]

Log message for revision 121931:
  Merge Zope/branches/2.13 121929

Changed:
  U   Zope/trunk/src/Zope2/App/startup.py

-=-
Modified: Zope/trunk/src/Zope2/App/startup.py
===================================================================
--- Zope/trunk/src/Zope2/App/startup.py	2011-06-14 16:00:05 UTC (rev 121930)
+++ Zope/trunk/src/Zope2/App/startup.py	2011-06-14 16:03:07 UTC (rev 121931)
@@ -323,7 +323,7 @@
 
             while object is not None and \
                   not hasattr(object, 'getPhysicalPath'):
-                if not hasattr(object, '__name__'):
+                if getattr(object, '__name__', None) is None:
                     object = None
                     break
                 to_append = (object.__name__,) + to_append