[Checkins] SVN: zope.configuration/trunk/ Don't fail in xmlconfig when zope.testing is not installed.

[Dan Korostelev]

Log message for revision 97385:
  Don't fail in xmlconfig when zope.testing is not installed.

Changed:
  U   zope.configuration/trunk/CHANGES.txt
  U   zope.configuration/trunk/buildout.cfg
  D   zope.configuration/trunk/src/zope/configuration/DEPENDENCIES.cfg
  U   zope.configuration/trunk/src/zope/configuration/xmlconfig.py

-=-
Modified: zope.configuration/trunk/CHANGES.txt
===================================================================
--- zope.configuration/trunk/CHANGES.txt	2009-02-28 15:23:12 UTC (rev 97384)
+++ zope.configuration/trunk/CHANGES.txt	2009-02-28 17:09:17 UTC (rev 97385)
@@ -5,7 +5,7 @@
 3.5.1 (unreleased)
 ------------------
 
-- ...
+- Don't fail when zope.testing is not installed.
 
 3.5.0 (2009-02-26)
 ------------------

Modified: zope.configuration/trunk/buildout.cfg
===================================================================
--- zope.configuration/trunk/buildout.cfg	2009-02-28 15:23:12 UTC (rev 97384)
+++ zope.configuration/trunk/buildout.cfg	2009-02-28 17:09:17 UTC (rev 97385)
@@ -1,7 +1,12 @@
 [buildout]
 develop = .
-parts = test
+parts = test python
 
 [test]
 recipe = zc.recipe.testrunner
+eggs = zope.configuration [test]
+
+[python]
+recipe = zc.recipe.egg
 eggs = zope.configuration
+interpreter = python

Deleted: zope.configuration/trunk/src/zope/configuration/DEPENDENCIES.cfg
===================================================================
--- zope.configuration/trunk/src/zope/configuration/DEPENDENCIES.cfg	2009-02-28 15:23:12 UTC (rev 97384)
+++ zope.configuration/trunk/src/zope/configuration/DEPENDENCIES.cfg	2009-02-28 17:09:17 UTC (rev 97385)
@@ -1,5 +0,0 @@
-zope.i18nmessageid
-zope.interface
-zope.schema
-zope.testing
-zope.deprecation

Modified: zope.configuration/trunk/src/zope/configuration/xmlconfig.py
===================================================================
--- zope.configuration/trunk/src/zope/configuration/xmlconfig.py	2009-02-28 15:23:12 UTC (rev 97384)
+++ zope.configuration/trunk/src/zope/configuration/xmlconfig.py	2009-02-28 17:09:17 UTC (rev 97385)
@@ -683,8 +683,13 @@
     global _context
     if _context is None:
         _clearContext()
-        from zope.testing.cleanup import addCleanUp
-        addCleanUp(_clearContext)
+        try:
+            from zope.testing.cleanup import addCleanUp
+        except ImportError:
+            pass
+        else:
+            addCleanUp(_clearContext)
+            del addCleanUp
     return _context
 
 class XMLConfig(object):