Remove deprecated content_transfer_encoding

CHANGES/8303.breaking.rst

@@ -0,0 +1,3 @@
+Removed ``content_transfer_encoding`` parameter in :py:meth:`FormData.add_field()
+<aiohttp.FormData.add_field>` and passing bytes no longer creates a file
+field unless the ``filename`` parameter is used -- by :user:`Dreamsorcerer`.

aiohttp/formdata.py

@@ -1,5 +1,4 @@
 import io
-import warnings
 from typing import Any, Iterable, List, Optional
 from urllib.parse import urlencode
 
@@ -50,18 +49,9 @@ def add_field(
         *,
         content_type: Optional[str] = None,
         filename: Optional[str] = None,
-        content_transfer_encoding: Optional[str] = None,
     ) -> None:
-        if isinstance(value, io.IOBase):
+        if isinstance(value, (io.IOBase, bytes, bytearray, memoryview)):
             self._is_multipart = True
-        elif isinstance(value, (bytes, bytearray, memoryview)):
-            msg = (
-                "In v4, passing bytes will no longer create a file field. "
-                "Please explicitly use the filename parameter or pass a BytesIO object."
-            )
-            if filename is None and content_transfer_encoding is None:
-                warnings.warn(msg, DeprecationWarning)
-                filename = name
 
         type_options: MultiDict[str] = MultiDict({"name": name})
         if filename is not None and not isinstance(filename, str):
@@ -82,18 +72,6 @@ def add_field(
                 )
             headers[hdrs.CONTENT_TYPE] = content_type
             self._is_multipart = True
-        if content_transfer_encoding is not None:
-            if not isinstance(content_transfer_encoding, str):
-                raise TypeError(
-                    "content_transfer_encoding must be an instance"
-                    " of str. Got: %s" % content_transfer_encoding
-                )
-            msg = (
-                "content_transfer_encoding is deprecated. "
-                "To maintain compatibility with v4 please pass a BytesPayload."
-            )
-            warnings.warn(msg, DeprecationWarning)
-            self._is_multipart = True
 
         self._fields.append((type_options, headers, value))
 

tests/test_web_functional.py

@@ -49,8 +49,7 @@ def fname(here: Any):
 
 def new_dummy_form():
     form = FormData()
-    with pytest.warns(DeprecationWarning, match="BytesPayload"):
-        form.add_field("name", b"123", content_transfer_encoding="base64")
+    form.add_field("name", b"123")
     return form
 
 
@@ -505,8 +504,7 @@ async def handler(request):
         return web.Response()
 
     form = FormData()
-    with pytest.warns(DeprecationWarning, match="BytesPayload"):
-        form.add_field("name", b"123", content_transfer_encoding="base64")
+    form.add_field("name", b"123")
 
     app = web.Application()
     app.router.add_post("/", handler)