[Zope-Checkins] SVN: Zope/branches/2.12/ Avoid possible errors on test tear-down in Products.Five.fiveconfigure's cleanUp() function if Products.meta_types has not been set

[Martin Aspeli]

Log message for revision 105503:
  Avoid possible errors on test tear-down in Products.Five.fiveconfigure's cleanUp() function if Products.meta_types has not been set

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/Products/Five/fiveconfigure.py

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2009-11-06 06:23:44 UTC (rev 105502)
+++ Zope/branches/2.12/doc/CHANGES.rst	2009-11-06 08:21:09 UTC (rev 105503)
@@ -11,8 +11,9 @@
 Bugs Fixed
 ++++++++++
 
+- Avoid possible errors on test tear-down in Products.Five.fiveconfigure's
+  cleanUp() function if Products.meta_types has not been set
 
-
 Zope 2.12.1 (2009/11/02)
 ------------------------
 

Modified: Zope/branches/2.12/src/Products/Five/fiveconfigure.py
===================================================================
--- Zope/branches/2.12/src/Products/Five/fiveconfigure.py	2009-11-06 06:23:44 UTC (rev 105502)
+++ Zope/branches/2.12/src/Products/Five/fiveconfigure.py	2009-11-06 08:21:09 UTC (rev 105503)
@@ -225,7 +225,7 @@
     _register_monkies = []
 
     global _meta_type_regs
-    Products.meta_types = tuple([ info for info in Products.meta_types
+    Products.meta_types = tuple([ info for info in getattr(Products, 'meta_types', [])
                                   if info['name'] not in _meta_type_regs ])
     _meta_type_regs = []