[Checkins] SVN: zope.security/trunk/ Provided a temporary fix for a hidden (and accidental) dependency of the

[Christian Theune]

Log message for revision 76554:
  Provided a temporary fix for a hidden (and accidental) dependency of the
  actual code to need zope.testing. I'll report a bug in a second that this
  needs to be seriously fixed in a different way IMHO.
  

Changed:
  U   zope.security/trunk/CHANGES.txt
  U   zope.security/trunk/src/zope/security/management.py

-=-
Modified: zope.security/trunk/CHANGES.txt
===================================================================
--- zope.security/trunk/CHANGES.txt	2007-06-10 09:56:33 UTC (rev 76553)
+++ zope.security/trunk/CHANGES.txt	2007-06-10 09:58:08 UTC (rev 76554)
@@ -4,6 +4,9 @@
 3.4.0b1
 -------
 
+- Temporarily fixed the hidden (and accidental) dependency on zope.testing to
+  become optional.
+
 Note: The releases between 3.2.0 and 3.4.0b1 where not tracked as an
 individual package and have been documented in the Zope 3 changelog.
 

Modified: zope.security/trunk/src/zope/security/management.py
===================================================================
--- zope.security/trunk/src/zope/security/management.py	2007-06-10 09:56:33 UTC (rev 76553)
+++ zope.security/trunk/src/zope/security/management.py	2007-06-10 09:58:08 UTC (rev 76554)
@@ -36,13 +36,18 @@
     global _defaultPolicy
     _defaultPolicy = ParanoidSecurityPolicy
 
+# XXX This code is used to support automated testing. However, it shouldn't be
+# here and needs to be refactored. The empty addCleanUp-method is a temporary
+# workaround to fix packages that depend on zope.security but don't have a
+# need for zope.testing.
 try:
     from zope.testing.cleanup import addCleanUp
 except ImportError:
-    pass
-else:
-    addCleanUp(_clear)
+    def addCleanUp(arg):
+        pass
 
+addCleanUp(_clear)
+
 #
 #   ISecurityManagement implementation
 #