Stop using the cgi module, deprecated in Python 3.11 per PEP 594 (aio…

…-libs#6708) * Stop using the cgi module, deprecated in Python 3.11 per PEP 594 https://peps.python.org/pep-0594/#cgi * Simplify creating params dict Co-authored-by: Sam Bull <[email protected]> * Create 6708.misc Co-authored-by: Sam Bull <[email protected]> (cherry picked from commit a045480)
scop · May 5, 2022 · c82bc1c · c82bc1c
1 parent 81130a5
commit c82bc1c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES/6708.misc b/CHANGES/6708.misc
@@ -0,0 +1 @@
+Replace deprecated cgi module usage with email.parser.
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -3,7 +3,7 @@
 import asyncio
 import base64
 import binascii
-import cgi
+import dataclasses
 import datetime
 import enum
 import functools
@@ -18,6 +18,7 @@
 import weakref
 from collections import namedtuple
 from contextlib import suppress
+from email.parser import HeaderParser
 from email.utils import parsedate
 from math import ceil
 from pathlib import Path
@@ -768,7 +769,10 @@ def _parse_content_type(self, raw: Optional[str]) -> None:
             self._content_type = "application/octet-stream"
             self._content_dict = {}
         else:
-            self._content_type, self._content_dict = cgi.parse_header(raw)
+            msg = HeaderParser().parsestr("Content-Type: " + raw)
+            self._content_type = msg.get_content_type()
+            params = msg.get_params()
+            self._content_dict = dict(params[1:])  # First element is content type again
 
     @property
     def content_type(self) -> str:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Replace deprecated cgi module usage with email.parser.