Remove DEFAULT_CHARSET setting

UTF-8 has been the universal web standard for over a decade. Hardcode
"utf-8" at each usage site instead of routing through a setting no one
would ever change.

Author: davegaeddert

plain-email/plain/email/backends/smtp.py

@@ -152,7 +152,7 @@ def _send(self, email_message: EmailMessage) -> bool:
         """A helper method that does the actual sending."""
         if not email_message.recipients():
             return False
-        encoding = email_message.encoding or settings.DEFAULT_CHARSET
+        encoding = email_message.encoding or "utf-8"
         from_email = _sanitize_address(email_message.from_email, encoding)
         recipients = [
             _sanitize_address(addr, encoding) for addr in email_message.recipients()

plain-email/plain/email/message.py

@@ -70,7 +70,7 @@ def _forbid_multi_line_headers(
     name: str, val: str, encoding: str | None
 ) -> tuple[str, str]:
     """Forbid multi-line headers to prevent header injection."""
-    encoding = encoding or settings.DEFAULT_CHARSET
+    encoding = encoding or "utf-8"
     val = str(val)  # val may be lazy
     if "\n" in val or "\r" in val:
         raise BadHeaderError(
@@ -281,7 +281,7 @@ def get_connection(self, fail_silently: bool = False) -> BaseEmailBackend:
         return self.connection
 
     def message(self) -> SafeMIMEText | SafeMIMEMultipart:
-        encoding = self.encoding or settings.DEFAULT_CHARSET
+        encoding = self.encoding or "utf-8"
         msg = SafeMIMEText(self.body, self.content_subtype, encoding)
         msg = self._create_message(msg)
         msg["Subject"] = self.subject
@@ -391,7 +391,7 @@ def _create_attachments(
         self, msg: SafeMIMEText | SafeMIMEMultipart
     ) -> SafeMIMEText | SafeMIMEMultipart:
         if self.attachments:
-            encoding = self.encoding or settings.DEFAULT_CHARSET
+            encoding = self.encoding or "utf-8"
             body_msg = msg
             msg = SafeMIMEMultipart(_subtype=self.mixed_subtype, encoding=encoding)
             if self.body or body_msg.is_multipart():
@@ -414,7 +414,7 @@ def _create_mime_attachment(
         """
         basetype, subtype = mimetype.split("/", 1)
         if basetype == "text":
-            encoding = self.encoding or settings.DEFAULT_CHARSET
+            encoding = self.encoding or "utf-8"
             if not isinstance(content, str):
                 content = force_str(content)
             attachment = SafeMIMEText(content, subtype, encoding)
@@ -528,7 +528,7 @@ def _create_message(self, msg: SafeMIMEText) -> SafeMIMEText | SafeMIMEMultipart
     def _create_alternatives(
         self, msg: SafeMIMEText | SafeMIMEMultipart
     ) -> SafeMIMEText | SafeMIMEMultipart:
-        encoding = self.encoding or settings.DEFAULT_CHARSET
+        encoding = self.encoding or "utf-8"
         if self.alternatives:
             body_msg = msg
             msg = SafeMIMEMultipart(

plain/plain/http/multipartparser.py

@@ -109,7 +109,7 @@ def __init__(self, request: Request):
         possible_sizes = [x.chunk_size for x in self._upload_handlers if x.chunk_size]
         self._chunk_size = min([2**31 - 4] + possible_sizes)
 
-        self._encoding = request.encoding or settings.DEFAULT_CHARSET
+        self._encoding = request.encoding or "utf-8"
         self._content_length = content_length
 
     def parse(self) -> tuple[Any, MultiValueDict]:

plain/plain/http/request.py

@@ -513,7 +513,7 @@ class QueryDict(MultiValueDict):
     will always return a mutable copy.
 
     Both keys and values set on this class are converted from the given encoding
-    (DEFAULT_CHARSET by default) to str.
+    (UTF-8 by default) to str.
     """
 
     # These are both reset in __init__, but is specified here at the class
@@ -528,7 +528,7 @@ def __init__(
         encoding: str | None = None,
     ):
         super().__init__()
-        self.encoding = encoding or settings.DEFAULT_CHARSET
+        self.encoding = encoding or "utf-8"
         query_string = query_string or ""
         parse_qsl_kwargs: dict[str, Any] = {
             "keep_blank_values": True,
@@ -579,7 +579,7 @@ def fromkeys(  # type: ignore[override]
     @property
     def encoding(self) -> str:
         if self._encoding is None:
-            self._encoding = settings.DEFAULT_CHARSET
+            self._encoding = "utf-8"
         return self._encoding
 
     @encoding.setter

plain/plain/http/response.py

@@ -17,7 +17,6 @@
 from plain import signals
 from plain.http.cookie import sign_cookie_value
 from plain.json import PlainJSONEncoder
-from plain.runtime import settings
 from plain.utils import timezone
 from plain.utils.datastructures import CaseInsensitiveMapping
 from plain.utils.encoding import iri_to_uri
@@ -178,7 +177,7 @@ def charset(self) -> str:
                 # store it back into the _charset for later intentionally, to
                 # allow for the Content-Type to be switched again later.
                 return matched["charset"].replace('"', "")
-        return settings.DEFAULT_CHARSET
+        return "utf-8"
 
     @charset.setter
     def charset(self, value: str) -> None:

plain/plain/runtime/global_settings.py

@@ -93,9 +93,6 @@
 # user time zone.
 TIME_ZONE: str = "UTC"
 
-# Default charset to use for all Response objects, if a MIME type isn't
-# manually specified. It's used to construct the Content-Type header.
-DEFAULT_CHARSET: str = "utf-8"
 
 # MARK: URL Configuration
 

plain/plain/test/client.py

@@ -11,7 +11,6 @@
 from plain.internal.handlers.base import BaseHandler
 from plain.internal.handlers.wsgi import WSGIRequest
 from plain.json import PlainJSONEncoder
-from plain.runtime import settings
 from plain.signals import request_started
 from plain.urls import get_resolver
 from plain.utils.encoding import force_bytes
@@ -293,7 +292,7 @@ def _encode_data(self, data: dict[str, Any] | str, content_type: str) -> bytes:
             if match:
                 charset = match[1]
             else:
-                charset = settings.DEFAULT_CHARSET
+                charset = "utf-8"
             return force_bytes(data, encoding=charset)
 
     def _encode_json(self, data: Any, content_type: str) -> Any:
@@ -472,7 +471,7 @@ def generic(
     ) -> WSGIRequest:
         """Construct an arbitrary HTTP request."""
         parsed = urlparse(str(path))  # path can be lazy
-        data = force_bytes(data, settings.DEFAULT_CHARSET)
+        data = force_bytes(data, "utf-8")
         r: dict[str, Any] = {
             "PATH_INFO": self._get_path(parsed),
             "REQUEST_METHOD": method,

plain/plain/test/encoding.py

@@ -4,7 +4,6 @@
 import os
 from typing import Any
 
-from plain.runtime import settings
 from plain.utils.encoding import force_bytes
 from plain.utils.itercompat import is_iterable
 
@@ -20,7 +19,7 @@ def encode_multipart(boundary: str, data: dict[str, Any]) -> bytes:
     lines: list[bytes] = []
 
     def to_bytes(s: str) -> bytes:
-        return force_bytes(s, settings.DEFAULT_CHARSET)
+        return force_bytes(s, "utf-8")
 
     # Not by any means perfect, but good enough for our purposes.
     def is_file(thing: Any) -> bool:
@@ -73,7 +72,7 @@ def is_file(thing: Any) -> bool:
 
 def encode_file(boundary: str, key: str, file: Any) -> list[bytes]:
     def to_bytes(s: str) -> bytes:
-        return force_bytes(s, settings.DEFAULT_CHARSET)
+        return force_bytes(s, "utf-8")
 
     # file.name might not be a string. For example, it's an int for
     # tempfile.TemporaryFile().