Merge pull request #20260 from edx/nedbat/context-managers-need-finally

Context managers need to clean up properly

common/djangoapps/util/db.py

@@ -164,9 +164,11 @@ def enable_named_outer_atomic(*names):
 
     for name in names:
         cache[name] = True
-    yield
-    for name in names:
-        del cache[name]
+    try:
+        yield
+    finally:
+        for name in names:
+            del cache[name]
 
 
 class OuterAtomic(transaction.Atomic):

common/test/utils.py

@@ -108,8 +108,10 @@ def skip_signal(signal, **kwargs):
     and then reconnecting the signal.
     """
     signal.disconnect(**kwargs)
-    yield
-    signal.connect(**kwargs)
+    try:
+        yield
+    finally:
+        signal.connect(**kwargs)
 
 
 class MockS3Mixin(object):

lms/djangoapps/courseware/field_overrides.py

@@ -77,8 +77,10 @@ def disable_overrides():
     """
     prev = _OVERRIDES_DISABLED.disabled
     _OVERRIDES_DISABLED.disabled += (True,)
-    yield
-    _OVERRIDES_DISABLED.disabled = prev
+    try:
+        yield
+    finally:
+        _OVERRIDES_DISABLED.disabled = prev
 
 
 def overrides_disabled():

lms/djangoapps/grades/api/v1/gradebook_views.py

@@ -71,9 +71,11 @@ def bulk_gradebook_view_context(course_key, users):
     CourseEnrollment.bulk_fetch_enrollment_states(users, course_key)
     cohorts.bulk_cache_cohorts(course_key, users)
     BulkRoleCache.prefetch(users)
-    yield
-    PersistentSubsectionGrade.clear_prefetched_data(course_key)
-    PersistentCourseGrade.clear_prefetched_data(course_key)
+    try:
+        yield
+    finally:
+        PersistentSubsectionGrade.clear_prefetched_data(course_key)
+        PersistentCourseGrade.clear_prefetched_data(course_key)
 
 
 def verify_writable_gradebook_enabled(view_func):

lms/djangoapps/grades/api/v1/views.py

@@ -35,8 +35,10 @@ def bulk_course_grade_context(course_key, users):
     on context exit.
     """
     PersistentCourseGrade.prefetch(course_key, users)
-    yield
-    PersistentCourseGrade.clear_prefetched_data(course_key)
+    try:
+        yield
+    finally:
+        PersistentCourseGrade.clear_prefetched_data(course_key)
 
 
 class CourseGradesView(GradeViewMixin, PaginatedAPIView):

lms/djangoapps/instructor_task/tests/test_tasks_helper.py

@@ -501,8 +501,10 @@ class TestProblemResponsesReport(TestReportMixin, InstructorTaskModuleTestCase):
         from xmodule.capa_module import CapaDescriptor
         generate_report_data = CapaDescriptor.generate_report_data
         del CapaDescriptor.generate_report_data
-        yield
-        CapaDescriptor.generate_report_data = generate_report_data
+        try:
+            yield
+        finally:
+            CapaDescriptor.generate_report_data = generate_report_data
 
     @patch.dict('django.conf.settings.FEATURES', {'MAX_PROBLEM_RESPONSES_COUNT': 4})
     def test_build_student_data_limit(self):

openedx/core/djangoapps/safe_sessions/middleware.py

@@ -505,7 +505,6 @@ def controlled_logging(request, logger):
 
     try:
         yield
-
     finally:
         if from_logout:
             logger.setLevel(default_level)

openedx/core/djangoapps/user_api/management/tests/test_bulk_user_org_email_optout.py

@@ -26,8 +26,10 @@ def _create_test_csv(csv_data):
     __, file_name = tempfile.mkstemp(text=True)
     with open(file_name, 'w') as file_pointer:
         file_pointer.write(csv_data.encode('utf-8'))
-    yield file_name
-    os.unlink(file_name)
+    try:
+        yield file_name
+    finally:
+        os.unlink(file_name)
 
 
 @mock.patch('openedx.core.djangoapps.user_api.management.commands.bulk_user_org_email_optout.log.info')