SF.net SVN: docutils:[10037 ] trunk/docutils

aa-turner--- via Docutils-checkins <[email protected]> Sat, 08 Mar 2025 18:12:13 +0000
Newsgroups gmane.text.docutils.cvs
Message-ID <[email protected]>
Revision: 10037
          http://sourceforge.net/p/docutils/code/10037
Author:   aa-turner
Date:     2025-03-08 18:12:13 +0000 (Sat, 08 Mar 2025)
Log Message:
-----------
Enable the UP (pyupgrade) category in Ruff

Modified Paths:
--------------
    trunk/docutils/.ruff.toml
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/test/test_transforms/test_substitution_expansion_length_limit.py

Modified: trunk/docutils/.ruff.toml
===================================================================
--- trunk/docutils/.ruff.toml	2025-03-08 10:57:49 UTC (rev 10036)
+++ trunk/docutils/.ruff.toml	2025-03-08 18:12:13 UTC (rev 10037)
@@ -7,9 +7,9 @@
 select = [
     "A",    # flake8-builtins
     "C4",   # flake8-comprehensions
+    "DTZ",  # flake8-datetimez
     "E",    # pycodestyle
     "EXE",  # flake8-executable
-    "DTZ",  # flake8-datetimez
     "F",    # pyflakes
     "FA",   # flake8-future-annotations
     "FURB", # refurb
@@ -27,6 +27,7 @@
     "T10",  # flake8-debugger
     "TCH",  # flake8-type-checking
     "TID",  # flake8-tidy-imports
+    "UP",   # pyupgrade
     "W",    # pycodestyle
     "YTT",  # flake8-2020
 ]
@@ -49,6 +50,8 @@
     "PT009",  # Use a regular assert instead of unittest-style
     "PT027",  # Use pytest.raises instead of unittest-style
     # We still use unittest.
+
+    "UP031",  # Use format specifiers instead of percent format
 ]
 
 [lint.per-file-ignores]

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2025-03-08 10:57:49 UTC (rev 10036)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2025-03-08 18:12:13 UTC (rev 10037)
@@ -2065,7 +2065,7 @@
         # \author
         # author name(s) and optional affiliation and contact info
         # cf. https://tex.stackexchange.com/a/377030/288060.
-        authors = ['\\\\\n'.join((field for field in author_entry if field))
+        authors = ['\\\\\n'.join(filter(None, author_entry))
                    for author_entry in self.author_stack]
         self.titledata.append(r'\author{%s}' % ' \\and\n'.join(authors))
         # \date

Modified: trunk/docutils/test/test_transforms/test_substitution_expansion_length_limit.py
===================================================================
--- trunk/docutils/test/test_transforms/test_substitution_expansion_length_limit.py	2025-03-08 10:57:49 UTC (rev 10036)
+++ trunk/docutils/test/test_transforms/test_substitution_expansion_length_limit.py	2025-03-08 18:12:13 UTC (rev 10037)
@@ -62,7 +62,7 @@
 
 |a| |c| continuation text
 """,
-"""\
+f"""\
 <document source="test data">
     <paragraph>
         The billion laughs attack for ReStructuredText:
@@ -69,9 +69,9 @@
     <substitution_definition names="a">
         lol
     <substitution_definition names="b">
-{}
+{b}
     <substitution_definition names="c">
-{}
+{c}
     <comment xml:space="preserve">
         ...
     <paragraph>
@@ -83,7 +83,7 @@
     <system_message backrefs="problematic-1" ids="system-message-1" level="3" line="9" source="test data" type="ERROR">
         <paragraph>
             Substitution definition "c" exceeds the line-length-limit.
-""".format(b, c)],
+"""],
 ])
 
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.