chore: use pre-commit configuration from Flask

Author: azmeuk

.pre-commit-config.yaml

@@ -1,30 +1,14 @@
----
 repos:
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.13.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.9
     hooks:
-      - id: pyupgrade
-        args: ["--py39-plus"]
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.11.0
-    hooks:
-      - id: reorder-python-imports
-        args: ["--application-directories", "src"]
-  - repo: https://github.com/psf/black
-    rev: 23.9.1
-    hooks:
-      - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          - flake8-bugbear
-          - flake8-implicit-str-concat
-          - flake8-pyproject
+      - id: ruff
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
-      - id: check-byte-order-marker
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: fix-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer

pyproject.toml

@@ -78,30 +78,22 @@ exclude_lines = [
     "pass",
 ]
 
-[tool.flake8]
-# B = bugbear
-# E = pycodestyle errors
-# F = flake8 pyflakes
-# W = pycodestyle warnings
-# B9 = bugbear opinions
-# ISC = implicit-str-concat
-select = ["B", "E", "F", "W", "B9", "ISC"]
-ignore = [
-    # slice notation whitespace, invalid
-    "E203",
-    # line length, handled by bugbear B950
-    "E501",
-    # bare except, handled by bugbear B001
-    "E722",
-    # bin op line break, invalid
-    "W503",
-    # requires 'strict' argument for 'zip'
-    # that needs python >= 3.10
-    "B905",
-]
-# up to 88 allowed by bugbear B950
-max-line-length = 80
-per-file-ignores = [
-    # __init__ modules export names
-    "**/__init__.py: F401, F403",
+[tool.ruff]
+src = ["src"]
+fix = true
+show-fixes = true
+output-format = "full"
+
+[tool.ruff.lint]
+select = [
+    "B",  # flake8-bugbear
+    "E",  # pycodestyle error
+    "F",  # pyflakes
+    "I",  # isort
+    "UP",  # pyupgrade
+    "W",  # pycodestyle warning
 ]
+
+[tool.ruff.lint.isort]
+force-single-line = true
+order-by-type = false

src/wtforms/__init__.py

@@ -35,7 +35,6 @@
 from wtforms.form import Form
 from wtforms.validators import ValidationError
 
-
 __version__ = "3.1.2"
 
 __all__ = [

src/wtforms/csrf/session.py

@@ -12,6 +12,7 @@
 validates with the hmac of the random value + expiration time, and the
 expiration time is not passed, the CSRF validation will pass.
 """
+
 import hmac
 import os
 from datetime import datetime

src/wtforms/fields/core.py

@@ -181,14 +181,14 @@ def check_validators(cls, validators):
             for validator in validators:
                 if not callable(validator):
                     raise TypeError(
-                        "{} is not a valid validator because it is not "
-                        "callable".format(validator)
+                        f"{validator} is not a valid validator because it is not "
+                        "callable"
                     )
 
                 if inspect.isclass(validator):
                     raise TypeError(
-                        "{} is not a valid validator because it is a class, "
-                        "it should be an instance".format(validator)
+                        f"{validator} is not a valid validator because it is a class, "
+                        "it should be an instance"
                     )
 
     def gettext(self, string):
@@ -399,8 +399,10 @@ def bind(self, form, name, prefix="", translations=None, **kwargs):
         return self.field_class(*self.args, **kw)
 
     def __repr__(self):
-        return "<UnboundField({}, {!r}, {!r})>".format(
-            self.field_class.__name__, self.args, self.kwargs
+        return (
+            "<UnboundField("
+            f"{self.field_class.__name__}, {self.args!r}, {self.kwargs!r}"
+            ")>"
         )
 
 
@@ -425,7 +427,8 @@ def __repr__(self):
             for name in dir(self)
             if not name.startswith("_")
         )
-        return "<wtforms.fields.Flags: {%s}>" % ", ".join(flags)
+        flags = ", ".join(flags)
+        return f"<wtforms.fields.Flags: {{{flags}}}>"
 
 
 class Label:

src/wtforms/fields/form.py

@@ -1,6 +1,7 @@
+from wtforms.utils import unset_value
+
 from .. import widgets
 from .core import Field
-from wtforms.utils import unset_value
 
 __all__ = ("FormField",)
 

src/wtforms/fields/list.py

@@ -1,9 +1,10 @@
 import itertools
 
+from wtforms.utils import unset_value
+
 from .. import widgets
 from .core import Field
 from .core import UnboundField
-from wtforms.utils import unset_value
 
 __all__ = ("FieldList",)
 

src/wtforms/form.py

@@ -113,7 +113,7 @@ def process(self, formdata=None, obj=None, data=None, extra_filters=None, **kwar
         for name, field in self._fields.items():
             field_extra_filters = filters.get(name, [])
 
-            inline_filter = getattr(self, "filter_%s" % name, None)
+            inline_filter = getattr(self, f"filter_{name}", None)
             if inline_filter is not None:
                 field_extra_filters.append(inline_filter)
 

src/wtforms/utils.py

@@ -1,6 +1,5 @@
 import re
 
-
 # https://docs.python.org/3/library/datetime.html#technical-detail (see NOTE #9)
 _DATETIME_STRIP_ZERO_PADDING_FORMATS_RE = re.compile(
     "%-["

src/wtforms/widgets/core.py

@@ -111,7 +111,7 @@ def __call__(self, field, **kwargs):
                 html.append(f"<li>{subfield.label} {subfield()}</li>")
             else:
                 html.append(f"<li>{subfield()} {subfield.label}</li>")
-        html.append("</%s>" % self.html_tag)
+        html.append(f"</{self.html_tag}>")
         return Markup("".join(html))
 
 
@@ -134,15 +134,15 @@ def __call__(self, field, **kwargs):
         html = []
         if self.with_table_tag:
             kwargs.setdefault("id", field.id)
-            html.append("<table %s>" % html_params(**kwargs))
+            table_params = html_params(**kwargs)
+            html.append(f"<table {table_params}>")
         hidden = ""
         for subfield in field:
             if subfield.type in ("HiddenField", "CSRFTokenField"):
                 hidden += str(subfield)
             else:
                 html.append(
-                    "<tr><th>%s</th><td>%s%s</td></tr>"
-                    % (str(subfield.label), hidden, str(subfield))
+                    f"<tr><th>{subfield.label}</th><td>{hidden}{subfield}</td></tr>"
                 )
                 hidden = ""
         if self.with_table_tag:
@@ -178,7 +178,8 @@ def __call__(self, field, **kwargs):
         for k in dir(flags):
             if k in self.validation_attrs and k not in kwargs:
                 kwargs[k] = getattr(flags, k)
-        return Markup("<input %s>" % self.html_params(name=field.name, **kwargs))
+        input_params = self.html_params(name=field.name, **kwargs)
+        return Markup(f"<input {input_params}>")
 
 
 class TextInput(Input):
@@ -321,9 +322,10 @@ def __call__(self, field, **kwargs):
         for k in dir(flags):
             if k in self.validation_attrs and k not in kwargs:
                 kwargs[k] = getattr(flags, k)
+        textarea_params = html_params(name=field.name, **kwargs)
+        textarea_innerhtml = escape(field._value())
         return Markup(
-            "<textarea %s>\r\n%s</textarea>"
-            % (html_params(name=field.name, **kwargs), escape(field._value()))
+            f"<textarea {textarea_params}>\r\n{textarea_innerhtml}</textarea>"
         )
 
 
@@ -356,10 +358,12 @@ def __call__(self, field, **kwargs):
         for k in dir(flags):
             if k in self.validation_attrs and k not in kwargs:
                 kwargs[k] = getattr(flags, k)
-        html = ["<select %s>" % html_params(name=field.name, **kwargs)]
+        select_params = html_params(name=field.name, **kwargs)
+        html = [f"<select {select_params}>"]
         if field.has_groups():
             for group, choices in field.iter_groups():
-                html.append("<optgroup %s>" % html_params(label=group))
+                optgroup_params = html_params(label=group)
+                html.append(f"<optgroup {optgroup_params}>")
                 for choice in choices:
                     if len(choice) == 4:
                         val, label, selected, render_kw = choice

tests/fields/test_boolean.py

@@ -1,5 +1,4 @@
 from tests.common import DummyPostData
-
 from wtforms.fields import BooleanField
 from wtforms.form import Form
 

tests/fields/test_date.py

@@ -1,7 +1,6 @@
 from datetime import date
 
 from tests.common import DummyPostData
-
 from wtforms.fields import DateField
 from wtforms.form import Form
 

tests/fields/test_datetime.py

@@ -1,7 +1,6 @@
 from datetime import datetime
 
 from tests.common import DummyPostData
-
 from wtforms.fields import DateTimeField
 from wtforms.form import Form
 

tests/fields/test_datetimelocal.py

@@ -1,7 +1,6 @@
 from datetime import datetime
 
 from tests.common import DummyPostData
-
 from wtforms.fields import DateTimeLocalField
 from wtforms.form import Form
 

tests/fields/test_decimal.py

@@ -3,7 +3,6 @@
 from decimal import ROUND_UP
 
 from tests.common import DummyPostData
-
 from wtforms.fields import DecimalField
 from wtforms.form import Form
 

tests/fields/test_field.py

@@ -1,7 +1,7 @@
 import pytest
 from markupsafe import Markup
-from tests.common import DummyPostData
 
+from tests.common import DummyPostData
 from wtforms import meta
 from wtforms import validators
 from wtforms.fields import Field
@@ -131,9 +131,9 @@ def test_check_validators():
 
     with pytest.raises(
         TypeError,
-        match=r"{} is not a valid validator because "
+        match=rf"{v2} is not a valid validator because "
         "it is a class, it should be an "
-        "instance".format(v2),
+        "instance",
     ):
         Field(validators=[v2])
 

tests/fields/test_file.py

@@ -1,5 +1,4 @@
 from tests.common import DummyPostData
-
 from wtforms.fields import FileField
 from wtforms.fields import MultipleFileField
 from wtforms.form import Form

tests/fields/test_filters.py

@@ -1,5 +1,4 @@
 from tests.common import DummyPostData
-
 from wtforms.fields import StringField
 from wtforms.form import Form
 

tests/fields/test_flags.py

@@ -36,6 +36,6 @@ def test_repr(flags):
 
 def test_underscore_property(flags):
     with pytest.raises(AttributeError):
-        flags._foo
+        flags._foo  # noqa: B018
     flags._foo = 42
     assert flags._foo == 42

tests/fields/test_float.py

@@ -1,5 +1,4 @@
 from tests.common import DummyPostData
-
 from wtforms.fields import FloatField
 from wtforms.form import Form
 

tests/fields/test_form.py

@@ -1,6 +1,6 @@
 import pytest
-from tests.common import DummyPostData
 
+from tests.common import DummyPostData
 from wtforms import validators
 from wtforms.fields import FormField
 from wtforms.fields import StringField

tests/fields/test_html5.py

@@ -3,7 +3,6 @@
 from decimal import Decimal
 
 from tests.common import DummyPostData
-
 from wtforms import validators
 from wtforms.fields import DateField
 from wtforms.fields import DateTimeField
@@ -41,8 +40,8 @@ def _build_value(key, form_input, expected_html, data=unset_value):
     if data is unset_value:
         data = form_input
     if expected_html.startswith("type="):
-        expected_html = '<input id="{}" name="{}" {} value="{}">'.format(
-            key, key, expected_html, form_input
+        expected_html = (
+            f'<input id="{key}" name="{key}" {expected_html} value="{form_input}">'
         )
     return {
         "key": key,

tests/fields/test_integer.py

@@ -1,5 +1,4 @@
 from tests.common import DummyPostData
-
 from wtforms.fields import IntegerField
 from wtforms.form import Form
 

tests/fields/test_list.py

@@ -1,8 +1,8 @@
 from collections import namedtuple
 
 import pytest
-from tests.common import DummyPostData
 
+from tests.common import DummyPostData
 from wtforms import validators
 from wtforms.fields import FieldList
 from wtforms.fields import FormField

tests/fields/test_month.py

@@ -1,7 +1,6 @@
 from datetime import date
 
 from tests.common import DummyPostData
-
 from wtforms.fields import MonthField
 from wtforms.form import Form
 

tests/fields/test_radio.py

@@ -1,5 +1,4 @@
 from tests.common import DummyPostData
-
 from wtforms import validators
 from wtforms.fields import RadioField
 from wtforms.form import Form

tests/fields/test_select.py

@@ -1,6 +1,6 @@
 import pytest
-from tests.common import DummyPostData
 
+from tests.common import DummyPostData
 from wtforms import validators
 from wtforms import widgets
 from wtforms.fields import SelectField