suggested changes

django · Sep 14, 2022 · b009251 · b009251
1 parent 482b257
commit b009251
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
@@ -64,7 +64,8 @@ def close(self):
 
 
 class WSGIRequest(HttpRequest):
-    wsgi_non_picklable_attrs = frozenset(
+    non_picklable_attrs = HttpRequest.non_picklable_attrs | frozenset(["environ"])
+    meta_non_picklable_attrs = frozenset(
         [
             "wsgi.errors",
             "wsgi.input",
@@ -97,11 +98,11 @@ def __init__(self, environ):
         self.resolver_match = None
 
     def __getstate__(self):
-        obj_dict = self.__dict__.copy()
-        for attr in self.wsgi_non_picklable_attrs:
-            if attr in obj_dict["META"]:
-                del obj_dict["META"][attr]
-        return super().__getstate__()
+        state = super().__getstate__()
+        for attr in self.meta_non_picklable_attrs:
+            if attr in state["META"]:
+                del state["META"][attr]
+        return state
 
     def _get_scheme(self):
         return self.environ.get("wsgi.url_scheme")

diff --git a/django/http/request.py b/django/http/request.py
@@ -54,7 +54,6 @@ class HttpRequest:
     non_picklable_attrs = frozenset(
         [
             "resolver_match",
-            "environ",
             "_stream",
         ]
     )