Merge lp:~jelmer/brz/ignorefilterwarning into lp:brz

[Jelmer Vernooij]

Don't throw an incomprehensible traceback when a warning filter has already been removed.

Don't throw an incomprehensible traceback when a warning filter has already been removed.

I'm not entirely sure about this one; perhaps we should just not do any filtering of warnings in the code?

[Martin Packman (gz)]

I think this is actually reasonable, cleanup() should try to not throw things, only edgy bit is depending on the exception type raised by the remove() but seems fine.

review: Approve

=== modified file 'breezy/symbol_versioning.py'
--- breezy/symbol_versioning.py	2018-11-17 16:53:10 +0000
+++ breezy/symbol_versioning.py	2018-12-15 17:02:59 +0000
@@ -317,7 +317,10 @@
     """
     def cleanup():
         if filter:
-            warnings.filters.remove(filter)
+            try:
+                warnings.filters.remove(filter)
+            except IndexError:
+                pass
     return cleanup