move the ref cycle break into the finally block

python · ebonnal · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025
commit d50dabd8ddf1d87d698053bd59e1f7da4b19a29c
diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
@@ -633,11 +633,12 @@ def result_iterator():
 
                     # yield the awaited result
                     yield fs.pop()._result
-            except:
-                # break the reference cycle with fs[-1]._exception's traceback
-                fs.pop().cancel()
-                raise
+
             finally:
+                # break the reference cycle with fs[-1]._exception's traceback
+                if fs:
+                    fs.pop().cancel()
+
                 for future in fs:
                     future.cancel()