plain 0.13.1__py3-none-any.whl → 0.14.0__py3-none-any.whl

plain/preflight/messages.py

@@ -40,19 +40,12 @@ class CheckMessage:
             obj = self.obj._meta.label
         else:
             obj = str(self.obj)
-        id = "(%s) " % self.id if self.id else ""
-        hint = "\n\tHINT: %s" % self.hint if self.hint else ""
+        id = f"({self.id}) " if self.id else ""
+        hint = f"\n\tHINT: {self.hint}" if self.hint else ""
         return f"{obj}: {id}{self.msg}{hint}"
 
     def __repr__(self):
-        return "<{}: level={!r}, msg={!r}, hint={!r}, obj={!r}, id={!r}>".format(
-            self.__class__.__name__,
-            self.level,
-            self.msg,
-            self.hint,
-            self.obj,
-            self.id,
-        )
+        return f"<{self.__class__.__name__}: level={self.level!r}, msg={self.msg!r}, hint={self.hint!r}, obj={self.obj!r}, id={self.id!r}>"
 
     def is_serious(self, level=ERROR):
         return self.level >= level

plain/preflight/registry.py

@@ -54,8 +54,8 @@ class CheckRegistry:
             new_errors = check(package_configs=package_configs, databases=databases)
             if not is_iterable(new_errors):
                 raise TypeError(
-                    "The function %r did not return a list. All functions "
-                    "registered with the checks registry must return a list." % check,
+                    f"The function {check!r} did not return a list. All functions "
+                    "registered with the checks registry must return a list.",
                 )
             errors.extend(new_errors)
         return errors

plain/preflight/urls.py

@@ -46,8 +46,8 @@ def check_url_namespaces_unique(package_configs, **kwargs):
     for namespace in non_unique_namespaces:
         errors.append(
             Warning(
-                "URL namespace '{}' isn't unique. You may not be able to reverse "
-                "all URLs in this namespace".format(namespace),
+                f"URL namespace '{namespace}' isn't unique. You may not be able to reverse "
+                "all URLs in this namespace",
                 id="urls.W005",
             )
         )
@@ -92,8 +92,8 @@ def get_warning_for_invalid_pattern(pattern):
 
     return [
         Error(
-            "Your URL pattern {!r} is invalid. Ensure that urlpatterns is a list "
-            "of path() and/or re_path() instances.".format(pattern),
+            f"Your URL pattern {pattern!r} is invalid. Ensure that urlpatterns is a list "
+            "of path() and/or re_path() instances.",
             hint=hint,
             id="urls.E004",
         )

plain/runtime/global_settings.py

@@ -2,6 +2,7 @@
 Default Plain settings. Override these with settings in the module pointed to
 by the PLAIN_SETTINGS_MODULE environment variable.
 """
+
 from pathlib import Path
 
 from plain.runtime import APP_PATH as default_app_path

plain/runtime/user_settings.py

@@ -4,6 +4,7 @@ import os
 import time
 import types
 import typing
+from importlib.util import find_spec
 from pathlib import Path
 
 from plain.exceptions import ImproperlyConfigured
@@ -101,12 +102,11 @@ class Settings:
 
     def _load_default_settings(self, settings_module):
         for entry in getattr(settings_module, "INSTALLED_PACKAGES", []):
-            try:
-                if isinstance(entry, PackageConfig):
-                    app_settings = entry.module.default_settings
-                else:
-                    app_settings = importlib.import_module(f"{entry}.default_settings")
-            except ModuleNotFoundError:
+            if isinstance(entry, PackageConfig):
+                app_settings = entry.module.default_settings
+            elif find_spec(f"{entry}.default_settings"):
+                app_settings = importlib.import_module(f"{entry}.default_settings")
+            else:
                 continue
 
             self._load_module_settings(app_settings)

plain/signing.py

@@ -196,8 +196,8 @@ class Signer:
 
         if _SEP_UNSAFE.match(self.sep):
             raise ValueError(
-                "Unsafe Signer separator: %r (cannot be empty or consist of "
-                "only A-z0-9-_=)" % sep,
+                f"Unsafe Signer separator: {sep!r} (cannot be empty or consist of "
+                "only A-z0-9-_=)",
             )
 
     def signature(self, value, key=None):
@@ -209,12 +209,12 @@ class Signer:
 
     def unsign(self, signed_value):
         if self.sep not in signed_value:
-            raise BadSignature('No "%s" found in value' % self.sep)
+            raise BadSignature(f'No "{self.sep}" found in value')
         value, sig = signed_value.rsplit(self.sep, 1)
         for key in [self.key, *self.fallback_keys]:
             if constant_time_compare(sig, self.signature(value, key)):
                 return value
-        raise BadSignature('Signature "%s" does not match' % sig)
+        raise BadSignature(f'Signature "{sig}" does not match')
 
     def sign_object(self, obj, serializer=JSONSerializer, compress=False):
         """

plain/test/client.py

@@ -5,7 +5,6 @@ import sys
 from functools import partial
 from http import HTTPStatus
 from http.cookies import SimpleCookie
-from importlib import import_module
 from io import BytesIO, IOBase
 from itertools import chain
 from urllib.parse import unquote_to_bytes, urljoin, urlparse, urlsplit
@@ -21,6 +20,7 @@ from plain.utils.encoding import force_bytes
 from plain.utils.functional import SimpleLazyObject
 from plain.utils.http import urlencode
 from plain.utils.itercompat import is_iterable
+from plain.utils.module_loading import import_string
 from plain.utils.regex_helper import _lazy_re_compile
 
 __all__ = (
@@ -33,7 +33,7 @@ __all__ = (
 
 
 BOUNDARY = "BoUnDaRyStRiNg"
-MULTIPART_CONTENT = "multipart/form-data; boundary=%s" % BOUNDARY
+MULTIPART_CONTENT = f"multipart/form-data; boundary={BOUNDARY}"
 CONTENT_TYPE_RE = _lazy_re_compile(r".*; charset=([\w-]+);?")
 # Structured suffix spec: https://tools.ietf.org/html/rfc6838#section-4.2.8
 JSON_CONTENT_TYPE_RE = _lazy_re_compile(r"^application\/(.+\+)?json")
@@ -218,8 +218,8 @@ def encode_multipart(boundary, data):
     for key, value in data.items():
         if value is None:
             raise TypeError(
-                "Cannot encode None for key '%s' as POST data. Did you mean "
-                "to pass an empty string or omit the value?" % key
+                f"Cannot encode None for key '{key}' as POST data. Did you mean "
+                "to pass an empty string or omit the value?"
             )
         elif is_file(value):
             lines.extend(encode_file(boundary, key, value))
@@ -231,8 +231,8 @@ def encode_multipart(boundary, data):
                     lines.extend(
                         to_bytes(val)
                         for val in [
-                            "--%s" % boundary,
-                            'Content-Disposition: form-data; name="%s"' % key,
+                            f"--{boundary}",
+                            f'Content-Disposition: form-data; name="{key}"',
                             "",
                             item,
                         ]
@@ -241,8 +241,8 @@ def encode_multipart(boundary, data):
             lines.extend(
                 to_bytes(val)
                 for val in [
-                    "--%s" % boundary,
-                    'Content-Disposition: form-data; name="%s"' % key,
+                    f"--{boundary}",
+                    f'Content-Disposition: form-data; name="{key}"',
                     "",
                     value,
                 ]
@@ -250,7 +250,7 @@ def encode_multipart(boundary, data):
 
     lines.extend(
         [
-            to_bytes("--%s--" % boundary),
+            to_bytes(f"--{boundary}--"),
             b"",
         ]
     )
@@ -277,11 +277,11 @@ def encode_file(boundary, key, file):
         content_type = "application/octet-stream"
     filename = filename or key
     return [
-        to_bytes("--%s" % boundary),
+        to_bytes(f"--{boundary}"),
         to_bytes(
             f'Content-Disposition: form-data; name="{key}"; filename="{filename}"'
         ),
-        to_bytes("Content-Type: %s" % content_type),
+        to_bytes(f"Content-Type: {content_type}"),
         b"",
         to_bytes(file.read()),
     ]
@@ -562,11 +562,11 @@ class ClientMixin:
     @property
     def session(self):
         """Return the current session variables."""
-        engine = import_module(settings.SESSION_ENGINE)
+        Session = import_string(settings.SESSION_CLASS)
         cookie = self.cookies.get(settings.SESSION_COOKIE_NAME)
         if cookie:
-            return engine.SessionStore(cookie.value)
-        session = engine.SessionStore()
+            return Session(cookie.value)
+        session = Session()
         session.save()
         self.cookies[settings.SESSION_COOKIE_NAME] = session.session_key
         return session
@@ -582,8 +582,8 @@ class ClientMixin:
         if self.session:
             request.session = self.session
         else:
-            engine = import_module(settings.SESSION_ENGINE)
-            request.session = engine.SessionStore()
+            Session = import_string(settings.SESSION_CLASS)
+            request.session = Session()
         login(request, user)
         # Save the session values.
         request.session.save()
@@ -608,8 +608,8 @@ class ClientMixin:
             request.session = self.session
             request.user = get_user(request)
         else:
-            engine = import_module(settings.SESSION_ENGINE)
-            request.session = engine.SessionStore()
+            Session = import_string(settings.SESSION_CLASS)
+            request.session = Session()
         logout(request)
         self.cookies = SimpleCookie()
 
@@ -617,8 +617,9 @@ class ClientMixin:
         if not hasattr(response, "_json"):
             if not JSON_CONTENT_TYPE_RE.match(response.get("Content-Type")):
                 raise ValueError(
-                    'Content-Type header is "%s", not "application/json"'
-                    % response.get("Content-Type")
+                    'Content-Type header is "{}", not "application/json"'.format(
+                        response.get("Content-Type")
+                    )
                 )
             response._json = json.loads(
                 response.content.decode(response.charset), **extra
@@ -670,7 +671,7 @@ class Client(ClientMixin, RequestFactory):
         environ = self._base_environ(**request)
 
         # Capture exceptions created by the handler.
-        exception_uid = "request-exception-%s" % id(request)
+        exception_uid = f"request-exception-{id(request)}"
         got_request_exception.connect(self.store_exc_info, dispatch_uid=exception_uid)
         try:
             response = self.handler(environ)

plain/urls/base.py

@@ -69,7 +69,7 @@ def reverse(viewname, urlconf=None, args=None, kwargs=None, using_namespace=None
                         )
                     )
                 else:
-                    raise NoReverseMatch("%s is not a registered namespace" % key)
+                    raise NoReverseMatch(f"{key} is not a registered namespace")
         if ns_pattern:
             resolver = get_ns_resolver(
                 ns_pattern, resolver, tuple(ns_converters.items())

plain/urls/conf.py

@@ -1,4 +1,5 @@
 """Functions for use in URLsconfs."""
+
 from functools import partial
 
 from plain.exceptions import ImproperlyConfigured
@@ -24,7 +25,7 @@ def include(arg, namespace=None):
                     "provides a namespace."
                 )
             raise ImproperlyConfigured(
-                "Passing a %d-tuple to include() is not supported. Pass a "
+                "Passing a %d-tuple to include() is not supported. Pass a "  # noqa: UP031
                 "2-tuple containing the list of patterns and default_namespace, and "
                 "provide the namespace argument to include() instead." % len(arg)
             )

plain/urls/resolvers.py

@@ -5,6 +5,7 @@ URLResolver is the main class here. Its resolve() method takes a URL (as
 a string) and returns a ResolverMatch object which provides access to all
 attributes of the resolved URL match.
 """
+
 import functools
 import inspect
 import re
@@ -145,11 +146,9 @@ class CheckURLMixin:
             "/"
         ):
             warning = Warning(
-                "Your URL pattern {} has a route beginning with a '/'. Remove this "
+                f"Your URL pattern {self.describe()} has a route beginning with a '/'. Remove this "
                 "slash as it is unnecessary. If this pattern is targeted in an "
-                "include(), ensure the include() pattern has a trailing '/'.".format(
-                    self.describe()
-                ),
+                "include(), ensure the include() pattern has a trailing '/'.",
                 id="urls.W002",
             )
             return [warning]
@@ -194,9 +193,9 @@ class RegexPattern(CheckURLMixin):
         if regex_pattern.endswith("$") and not regex_pattern.endswith(r"\$"):
             return [
                 Warning(
-                    "Your URL pattern {} uses include with a route ending with a '$'. "
+                    f"Your URL pattern {self.describe()} uses include with a route ending with a '$'. "
                     "Remove the dollar from the route to avoid problems including "
-                    "URLs.".format(self.describe()),
+                    "URLs.",
                     id="urls.W001",
                 )
             ]
@@ -238,16 +237,16 @@ def _route_to_regex(route, is_endpoint=False):
             break
         elif not set(match.group()).isdisjoint(string.whitespace):
             raise ImproperlyConfigured(
-                "URL route '%s' cannot contain whitespace in angle brackets "
-                "<…>." % original_route
+                f"URL route '{original_route}' cannot contain whitespace in angle brackets "
+                "<…>."
             )
         parts.append(re.escape(route[: match.start()]))
         route = route[match.end() :]
         parameter = match["parameter"]
         if not parameter.isidentifier():
             raise ImproperlyConfigured(
-                "URL route '{}' uses parameter name {!r} which isn't a valid "
-                "Python identifier.".format(original_route, parameter)
+                f"URL route '{original_route}' uses parameter name {parameter!r} which isn't a valid "
+                "Python identifier."
             )
         raw_converter = match["converter"]
         if raw_converter is None:
@@ -257,9 +256,7 @@ def _route_to_regex(route, is_endpoint=False):
             converter = get_converter(raw_converter)
         except KeyError as e:
             raise ImproperlyConfigured(
-                "URL route {!r} uses invalid converter {!r}.".format(
-                    original_route, raw_converter
-                )
+                f"URL route {original_route!r} uses invalid converter {raw_converter!r}."
             ) from e
         converters[parameter] = converter
         parts.append("(?P<" + parameter + ">" + converter.regex + ")")
@@ -297,9 +294,9 @@ class RoutePattern(CheckURLMixin):
         if "(?P<" in route or route.startswith("^") or route.endswith("$"):
             warnings.append(
                 Warning(
-                    "Your URL pattern {} has a route that contains '(?P<', begins "
+                    f"Your URL pattern {self.describe()} has a route that contains '(?P<', begins "
                     "with a '^', or ends with a '$'. This was likely an oversight "
-                    "when migrating to plain.urls.path().".format(self.describe()),
+                    "when migrating to plain.urls.path().",
                     id="2_0.W001",
                 )
             )
@@ -334,8 +331,8 @@ class URLPattern:
         """
         if self.pattern.name is not None and ":" in self.pattern.name:
             warning = Warning(
-                "Your URL pattern {} has a name including a ':'. Remove the colon, to "
-                "avoid ambiguous namespace references.".format(self.pattern.describe()),
+                f"Your URL pattern {self.pattern.describe()} has a name including a ':'. Remove the colon, to "
+                "avoid ambiguous namespace references.",
                 id="urls.W003",
             )
             return [warning]
@@ -349,12 +346,8 @@ class URLPattern:
         if inspect.isclass(view) and issubclass(view, View):
             return [
                 Error(
-                    "Your URL pattern {} has an invalid view, pass {}.as_view() "
-                    "instead of {}.".format(
-                        self.pattern.describe(),
-                        view.__name__,
-                        view.__name__,
-                    ),
+                    f"Your URL pattern {self.pattern.describe()} has an invalid view, pass {view.__name__}.as_view() "
+                    f"instead of {view.__name__}.",
                     id="urls.E009",
                 )
             ]
@@ -422,16 +415,10 @@ class URLResolver:
     def __repr__(self):
         if isinstance(self.urlconf_name, list) and self.urlconf_name:
             # Don't bother to output the whole list, it can be huge
-            urlconf_repr = "<%s list>" % self.urlconf_name[0].__class__.__name__
+            urlconf_repr = f"<{self.urlconf_name[0].__class__.__name__} list>"
         else:
             urlconf_repr = repr(self.urlconf_name)
-        return "<{} {} ({}:{}) {}>".format(
-            self.__class__.__name__,
-            urlconf_repr,
-            self.default_namespace,
-            self.namespace,
-            self.pattern.describe(),
-        )
+        return f"<{self.__class__.__name__} {urlconf_repr} ({self.default_namespace}:{self.namespace}) {self.pattern.describe()}>"
 
     def check(self):
         messages = []
@@ -714,10 +701,10 @@ class URLResolver:
             if args:
                 arg_msg = f"arguments '{args}'"
             elif kwargs:
-                arg_msg = "keyword arguments '%s'" % kwargs
+                arg_msg = f"keyword arguments '{kwargs}'"
             else:
                 arg_msg = "no arguments"
-            msg = "Reverse for '%s' with %s not found. %d pattern(s) tried: %s" % (
+            msg = "Reverse for '%s' with %s not found. %d pattern(s) tried: %s" % (  # noqa: UP031
                 lookup_view_s,
                 arg_msg,
                 len(patterns),

plain/utils/cache.py

@@ -14,6 +14,7 @@ cache keys to prevent delivery of wrong content.
 An example: i18n middleware would need to distinguish caches by the
 "Accept-language" header.
 """
+
 import time
 from collections import defaultdict
 from hashlib import md5

plain/utils/crypto.py

@@ -1,6 +1,7 @@
 """
 Plain's standard crypto functions and utilities.
 """
+
 import hashlib
 import hmac
 import secrets
@@ -32,7 +33,7 @@ def salted_hmac(key_salt, value, secret=None, *, algorithm="sha1"):
         hasher = getattr(hashlib, algorithm)
     except AttributeError as e:
         raise InvalidAlgorithm(
-            "%r is not an algorithm accepted by the hashlib module." % algorithm
+            f"{algorithm!r} is not an algorithm accepted by the hashlib module."
         ) from e
     # We need to generate a derived key from our base key.  We can do this by
     # passing the key_salt and our base key through a pseudo-random function.

plain/utils/datastructures.py

@@ -198,7 +198,7 @@ class MultiValueDict(dict):
     def update(self, *args, **kwargs):
         """Extend rather than replace existing key lists."""
         if len(args) > 1:
-            raise TypeError("update expected at most 1 argument, got %d" % len(args))
+            raise TypeError("update expected at most 1 argument, got %d" % len(args))  # noqa: UP031
         if args:
             arg = args[0]
             if isinstance(arg, MultiValueDict):
@@ -340,6 +340,6 @@ class CaseInsensitiveMapping(Mapping):
                 )
             if not isinstance(elem[0], str):
                 raise ValueError(
-                    "Element key %r invalid, only strings are allowed" % elem[0]
+                    f"Element key {elem[0]!r} invalid, only strings are allowed"
                 )
             yield elem

plain/utils/dateformat.py

@@ -10,6 +10,7 @@ Usage:
 7th October 2003 11:39
 >>>
 """
+
 import calendar
 from datetime import date, datetime, time
 from email.utils import format_datetime as format_datetime_rfc5322
@@ -42,7 +43,7 @@ class Formatter:
                 if type(self.data) is date and hasattr(TimeFormat, piece):
                     raise TypeError(
                         "The format for date objects may not contain "
-                        "time-related format specifiers (found '%s')." % piece
+                        f"time-related format specifiers (found '{piece}')."
                     )
                 pieces.append(str(getattr(self, piece)()))
             elif piece:
@@ -103,7 +104,7 @@ class TimeFormat(Formatter):
         """
         hour = self.data.hour % 12 or 12
         minute = self.data.minute
-        return "%d:%02d" % (hour, minute) if minute else hour
+        return "%d:%02d" % (hour, minute) if minute else hour  # noqa: UP031
 
     def g(self):
         "Hour, 12-hour format without leading zeros; i.e. '1' to '12'"
@@ -115,15 +116,15 @@ class TimeFormat(Formatter):
 
     def h(self):
         "Hour, 12-hour format; i.e. '01' to '12'"
-        return "%02d" % (self.data.hour % 12 or 12)
+        return "%02d" % (self.data.hour % 12 or 12)  # noqa: UP031
 
     def H(self):
         "Hour, 24-hour format; i.e. '00' to '23'"
-        return "%02d" % self.data.hour
+        return "%02d" % self.data.hour  # noqa: UP031
 
     def i(self):
         "Minutes; i.e. '00' to '59'"
-        return "%02d" % self.data.minute
+        return "%02d" % self.data.minute  # noqa: UP031
 
     def O(self):  # NOQA: E743, E741
         """
@@ -138,7 +139,7 @@ class TimeFormat(Formatter):
         seconds = offset.days * 86400 + offset.seconds
         sign = "-" if seconds < 0 else "+"
         seconds = abs(seconds)
-        return "%s%02d%02d" % (sign, seconds // 3600, (seconds // 60) % 60)
+        return "%s%02d%02d" % (sign, seconds // 3600, (seconds // 60) % 60)  # noqa: UP031
 
     def P(self):
         """
@@ -155,7 +156,7 @@ class TimeFormat(Formatter):
 
     def s(self):
         "Seconds; i.e. '00' to '59'"
-        return "%02d" % self.data.second
+        return "%02d" % self.data.second  # noqa: UP031
 
     def T(self):
         """
@@ -170,7 +171,7 @@ class TimeFormat(Formatter):
 
     def u(self):
         "Microseconds; i.e. '000000' to '999999'"
-        return "%06d" % self.data.microsecond
+        return "%06d" % self.data.microsecond  # noqa: UP031
 
     def Z(self):
         """
@@ -206,7 +207,7 @@ class DateFormat(TimeFormat):
 
     def d(self):
         "Day of the month, 2 digits with leading zeros; i.e. '01' to '31'"
-        return "%02d" % self.data.day
+        return "%02d" % self.data.day  # noqa: UP031
 
     def D(self):
         "Day of the week, textual, 3 letters; e.g. 'Fri'"
@@ -240,7 +241,7 @@ class DateFormat(TimeFormat):
 
     def m(self):
         "Month; i.e. '01' to '12'"
-        return "%02d" % self.data.month
+        return "%02d" % self.data.month  # noqa: UP031
 
     def M(self):
         "Month, textual, 3 letters; e.g. 'Jan'"
@@ -306,11 +307,11 @@ class DateFormat(TimeFormat):
 
     def y(self):
         """Year, 2 digits with leading zeros; e.g. '99'."""
-        return "%02d" % (self.data.year % 100)
+        return "%02d" % (self.data.year % 100)  # noqa: UP031
 
     def Y(self):
         """Year, 4 digits with leading zeros; e.g. '1999'."""
-        return "%04d" % self.data.year
+        return "%04d" % self.data.year  # noqa: UP031
 
     def z(self):
         """Day of the year, i.e. 1 to 366."""

plain/utils/dateparse.py

@@ -118,7 +118,7 @@ def parse_datetime(value):
             kw["microsecond"] = kw["microsecond"] and kw["microsecond"].ljust(6, "0")
             tzinfo = kw.pop("tzinfo")
             if tzinfo == "Z":
-                tzinfo = datetime.timezone.utc
+                tzinfo = datetime.UTC
             elif tzinfo is not None:
                 offset_mins = int(tzinfo[-2:]) if len(tzinfo) > 3 else 0
                 offset = 60 * int(tzinfo[1:3]) + offset_mins

plain/utils/decorators.py

@@ -86,5 +86,5 @@ def method_decorator(decorator, name=""):
         update_wrapper(_dec, decorator)
     # Change the name to aid debugging.
     obj = decorator if hasattr(decorator, "__name__") else decorator.__class__
-    _dec.__name__ = "method_decorator(%s)" % obj.__name__
+    _dec.__name__ = f"method_decorator({obj.__name__})"
     return _dec

plain/utils/html.py

@@ -43,7 +43,7 @@ _js_escapes = {
 }
 
 # Escape every ASCII character with a value less than 32.
-_js_escapes.update((ord("%c" % z), "\\u%04X" % z) for z in range(32))
+_js_escapes.update((ord("%c" % z), f"\\u{z:04X}") for z in range(32))  # noqa: UP031
 
 
 @keep_lazy(SafeString)
@@ -132,9 +132,9 @@ def linebreaks(value, autoescape=False):
     value = normalize_newlines(value)
     paras = re.split("\n{2,}", str(value))
     if autoescape:
-        paras = ["<p>%s</p>" % escape(p).replace("\n", "<br>") for p in paras]
+        paras = ["<p>{}</p>".format(escape(p).replace("\n", "<br>")) for p in paras]
     else:
-        paras = ["<p>%s</p>" % p.replace("\n", "<br>") for p in paras]
+        paras = ["<p>{}</p>".format(p.replace("\n", "<br>")) for p in paras]
     return "\n\n".join(paras)
 
 
@@ -148,10 +148,10 @@ class MLStripper(HTMLParser):
         self.fed.append(d)
 
     def handle_entityref(self, name):
-        self.fed.append("&%s;" % name)
+        self.fed.append(f"&{name};")
 
     def handle_charref(self, name):
-        self.fed.append("&#%s;" % name)
+        self.fed.append(f"&#{name};")
 
     def get_data(self):
         return "".join(self.fed)
@@ -293,7 +293,7 @@ class Urlizer:
             if self.simple_url_re.match(middle):
                 url = smart_urlquote(html.unescape(middle))
             elif self.simple_url_2_re.match(middle):
-                url = smart_urlquote("http://%s" % html.unescape(middle))
+                url = smart_urlquote(f"http://{html.unescape(middle)}")
             elif ":" not in middle and self.is_email_simple(middle):
                 local, domain = middle.rsplit("@", 1)
                 try:
@@ -328,7 +328,7 @@ class Urlizer:
     def trim_url(self, x, *, limit):
         if limit is None or len(x) <= limit:
             return x
-        return "%s…" % x[: max(0, limit - 1)]
+        return f"{x[: max(0, limit - 1)]}…"
 
     def trim_punctuation(self, word):
         """