Merge branch '2.13' into str-format-213

zopefoundation · Feb 1, 2017 · b705f0d · b705f0d
2 parents 122ff6a + 512dfac
commit b705f0d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/AccessControl/SimpleObjectPolicies.py b/src/AccessControl/SimpleObjectPolicies.py
@@ -128,8 +128,10 @@ def override_containers(type_, assertions):
     """Temporarily override the container assertions."""
     orig_container = Containers(type_, _marker)
     ContainerAssertions[type_] = assertions
-    yield
-    if orig_container is _marker:
-        del ContainerAssertions[type_]
-    else:
-        ContainerAssertions[type_] = orig_container
+    try:
+        yield
+    finally:
+        if orig_container is _marker:
+            del ContainerAssertions[type_]
+        else:
+            ContainerAssertions[type_] = orig_container