Made closing in connection handlers more DRY.

ngnpope · web-flow · commit 20e65a34aea0 · 2022-05-12T15:13:51.000+02:00
diff --git a/django/core/cache/__init__.py b/django/core/cache/__init__.py
@@ -60,8 +60,7 @@ def create_connection(self, alias):
 def close_caches(**kwargs):
     # Some caches need to do a cleanup at the end of a request cycle. If not
     # implemented in a particular backend cache.close() is a no-op.
-    for cache in caches.all(initialized_only=True):
-        cache.close()
+    caches.close_all()
 
 
 signals.request_finished.connect(close_caches)
diff --git a/django/db/utils.py b/django/db/utils.py
@@ -190,14 +190,6 @@ def create_connection(self, alias):
         backend = load_backend(db["ENGINE"])
         return backend.DatabaseWrapper(db, alias)
 
-    def close_all(self):
-        for alias in self:
-            try:
-                connection = getattr(self._connections, alias)
-            except AttributeError:
-                continue
-            connection.close()
-
 
 class ConnectionRouter:
     def __init__(self, routers=None):
diff --git a/django/utils/connection.py b/django/utils/connection.py
@@ -79,3 +79,7 @@ def all(self, initialized_only=False):
             # If initialized_only is True, return only initialized connections.
             if not initialized_only or hasattr(self._connections, alias)
         ]
+
+    def close_all(self):
+        for conn in self.all(initialized_only=True):
+            conn.close()

Original file line number	Diff line number	Diff line change
`@@ -79,3 +79,7 @@ def all(self, initialized_only=False):`
`79`	`79`	`# If initialized_only is True, return only initialized connections.`
`80`	`80`	`if not initialized_only or hasattr(self._connections, alias)`
`81`	`81`	`]`
	`82`	`+`
	`83`	`+ def close_all(self):`
	`84`	`+ for conn in self.all(initialized_only=True):`
	`85`	`+ conn.close()`