[py-svn] r20001 - in py/dist/py/log: . testing

cfbolz at codespeak.net cfbolz at codespeak.net
Fri Nov 18 11:32:00 CET 2005


Author: cfbolz
Date: Fri Nov 18 11:31:59 2005
New Revision: 20001

Modified:
   py/dist/py/log/logger.py
   py/dist/py/log/testing/test_logger.py
Log:
make del_override not raise an exception if called twice/without an override
set. test


Modified: py/dist/py/log/logger.py
==============================================================================
--- py/dist/py/log/logger.py	(original)
+++ py/dist/py/log/logger.py	Fri Nov 18 11:31:59 2005
@@ -51,7 +51,10 @@
         self._override = lambda msg: consumer(msg)
 
     def del_override(self):
-        del self._override 
+        try:
+            del self._override 
+        except AttributeError:
+            pass
 
     def _setsub(self, name, dest): 
         assert "_" not in name 

Modified: py/dist/py/log/testing/test_logger.py
==============================================================================
--- py/dist/py/log/testing/test_logger.py	(original)
+++ py/dist/py/log/testing/test_logger.py	Fri Nov 18 11:31:59 2005
@@ -38,6 +38,7 @@
     assert r == ["hello", "world", "42"]
     l[:] = []
     log.del_override()
+    log.del_override()
     log.x2("hello")
     assert l2[0].strcontent() == "hello"
 



More information about the pytest-commit mailing list