Upgrade to Ruff 0.13.0

Author: seanh

h/activity/bucketing.py

@@ -12,7 +12,7 @@
 _ = i18n.TranslationStringFactory(__package__)
 
 
-class DocumentBucket:
+class DocumentBucket:  # noqa: PLW1641
     def __init__(self, document, annotations=None):
         self.annotations = []
         self.tags = set()

h/cli/commands/create_annotations.py

@@ -8,7 +8,7 @@
 @click.pass_context
 @click.option("--number", default=100)
 def create_annotations(ctx, number):
-    from tests.common import factories
+    from tests.common import factories  # noqa: PLC0415
 
     request = ctx.obj["bootstrap"]()
     db = request.db

h/db/__init__.py

@@ -122,7 +122,7 @@ def close_the_sqlalchemy_session(_request):
 
 
 def _maybe_create_default_organization(engine, authority):  # pragma: no cover
-    from h.services.organization import OrganizationService
+    from h.services.organization import OrganizationService  # noqa: PLC0415
 
     session = Session(bind=engine)
     default_org = OrganizationService(session).get_default(authority)
@@ -134,8 +134,8 @@ def _maybe_create_default_organization(engine, authority):  # pragma: no cover
 
 
 def _maybe_create_world_group(engine, authority, default_org):  # pragma: no cover
-    from h import models
-    from h.models.group import ReadableBy, WriteableBy
+    from h import models  # noqa: PLC0415
+    from h.models.group import ReadableBy, WriteableBy  # noqa: PLC0415
 
     session = Session(bind=engine)
     world_group = session.query(models.Group).filter_by(pubid="__world__").one_or_none()

h/db/types.py

@@ -1,4 +1,4 @@
-"""Custom SQLAlchemy types for use with the Annotations API database."""  # noqa: A005
+"""Custom SQLAlchemy types for use with the Annotations API database."""
 
 import base64
 import binascii

h/form.py

@@ -49,7 +49,7 @@ def __call__(self, template_name, **kwargs):
         context = self._system.copy()
         context.update(kwargs)
 
-        return Markup(template.render(context))
+        return Markup(f"{template.render(context)}")  # noqa: S704
 
 
 def create_environment(base):

h/jinja_extensions/filters.py

@@ -37,4 +37,4 @@ def to_json(value):
         .replace("'", "\\u0027")
     )
 
-    return Markup(result)
+    return Markup(result)  # noqa: S704

h/jinja_extensions/svg_icon.py

@@ -48,4 +48,4 @@ def svg_icon(name, css_class=""):
     if title_el is not None:
         root.remove(title_el)
 
-    return Markup(ElementTree.tostring(root).decode())
+    return Markup(ElementTree.tostring(root).decode())  # noqa: S704

h/migrations/versions/58bb601c390f_fill_in_missing_denormalized_document_title.py

@@ -71,10 +71,12 @@ def downgrade():
 
 
 def _document_title(document):
-    for meta in document.meta_titles:  # noqa: RET503
+    for meta in document.meta_titles:
         if meta.value:
             return meta.value[0]
 
+    return None
+
 
 def _fetch_windows(session, chunksize=100):
     updated = (

h/migrations/versions/9f5e274b202c_update_all_document_web_uris.py

@@ -39,14 +39,16 @@ class Document(Base):
 
     def updated_web_uri(self):
         def first_http_url(type_=None):
-            for document_uri in self.document_uris:  # noqa: RET503
+            for document_uri in self.document_uris:
                 uri = document_uri.uri
                 if type_ is not None and document_uri.type != type_:
                     continue
                 if urlparse(uri).scheme not in ["http", "https"]:
                     continue
                 return document_uri.uri
 
+            return None
+
         return (
             first_http_url(type_="self-claim")
             or first_http_url(type_="rel-canonical")

h/migrations/versions/a44ef07b085a_fill_in_missing_denormalized_document_web_uri.py

@@ -68,11 +68,13 @@ def downgrade():
 
 
 def _document_web_uri(document):
-    for docuri in document.document_uris:  # noqa: RET503
+    for docuri in document.document_uris:
         uri = urlparse(docuri.uri)
         if uri.scheme in ["http", "https"]:
             return docuri.uri
 
+    return None
+
 
 def _fetch_windows(session, chunksize=100):
     updated = (