SF.net SVN: docutils:[9881 ] trunk/docutils
milde--- via Docutils-checkins <[email protected]>
| Newsgroups | gmane.text.docutils.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 9881
http://sourceforge.net/p/docutils/code/9881
Author: milde
Date: 2024-08-10 08:12:14 +0000 (Sat, 10 Aug 2024)
Log Message:
-----------
Smaller fixups (formatting, comments)
Modified Paths:
--------------
trunk/docutils/docutils/io.py
trunk/docutils/docutils/languages/__init__.py
trunk/docutils/docutils/nodes.py
trunk/docutils/docutils/parsers/rst/directives/admonitions.py
trunk/docutils/docutils/parsers/rst/languages/__init__.py
trunk/docutils/docutils/parsers/rst/states.py
trunk/docutils/docutils/readers/__init__.py
trunk/docutils/docutils/statemachine.py
trunk/docutils/docutils/transforms/frontmatter.py
trunk/docutils/docutils/transforms/references.py
trunk/docutils/docutils/utils/__init__.py
trunk/docutils/docutils/utils/math/tex2mathml_extern.py
trunk/docutils/docutils/utils/smartquotes.py
trunk/docutils/docutils/writers/html4css1/__init__.py
trunk/docutils/docutils/writers/manpage.py
trunk/docutils/test/alltests.py
trunk/docutils/test/test_io.py
Modified: trunk/docutils/docutils/io.py
===================================================================
--- trunk/docutils/docutils/io.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/io.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -39,7 +39,7 @@
_locale_encoding: str | None = (locale.getlocale()[1]
or locale.getdefaultlocale()[1]
).lower()
-except: # NoQA: E722
+except: # NoQA: E722 (catchall)
# Any problem determining the locale: use None
_locale_encoding = None
try:
Modified: trunk/docutils/docutils/languages/__init__.py
===================================================================
--- trunk/docutils/docutils/languages/__init__.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/languages/__init__.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -52,9 +52,8 @@
def __init__(self) -> None:
self.cache: dict[str, LanguageModuleT] = {}
- def import_from_packages(
- self, name: str, reporter: Reporter = None
- ) -> LanguageModuleT:
+ def import_from_packages(self, name: str, reporter: Reporter = None
+ ) -> LanguageModuleT:
"""Try loading module `name` from `self.packages`."""
module = None
for package in self.packages:
@@ -88,9 +87,8 @@
):
raise ImportError
- def __call__(
- self, language_code: str, reporter: Reporter = None
- ) -> LanguageModuleT:
+ def __call__(self, language_code: str, reporter: Reporter = None
+ ) -> LanguageModuleT:
try:
return self.cache[language_code]
except KeyError:
Modified: trunk/docutils/docutils/nodes.py
===================================================================
--- trunk/docutils/docutils/nodes.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/nodes.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -2483,7 +2483,7 @@
children = (p,) + children
try:
Element.__init__(self, rawsource, *children, **attributes)
- except: # NoQA: E722
+ except: # NoQA: E722 (catchall)
print('system_message: children=%r' % (children,))
raise
Modified: trunk/docutils/docutils/parsers/rst/directives/admonitions.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/admonitions.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/parsers/rst/directives/admonitions.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -96,6 +96,6 @@
node_class = nodes.tip
-class Warning(BaseAdmonition): # NoQA: A001 (builtin name)
+class Warning(BaseAdmonition): # NoQA: A001 (builtin shadowing)
node_class = nodes.warning
Modified: trunk/docutils/docutils/parsers/rst/languages/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/__init__.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/parsers/rst/languages/__init__.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -51,14 +51,11 @@
def check_content(self, module: types.ModuleType) -> NoReturn:
...
- def check_content(
- self, module: RSTLanguageModule | types.ModuleType
- ) -> None:
+ def check_content(self, module: RSTLanguageModule | types.ModuleType
+ ) -> None:
"""Check if we got an rST language module."""
- if not (
- isinstance(module.directives, dict)
- and isinstance(module.roles, dict)
- ):
+ if not (isinstance(module.directives, dict)
+ and isinstance(module.roles, dict)):
raise ImportError
Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/parsers/rst/states.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -2889,10 +2889,8 @@
text = parts[0].rstrip()
textnode = nodes.Text(text)
node_list[-1] += textnode
- node_list += [
- nodes.classifier(unescape(part, True), part)
- for part in parts[1:]
- ]
+ node_list += [nodes.classifier(unescape(part, True), part)
+ for part in parts[1:]]
else:
node_list[-1] += node
return node_list, messages
Modified: trunk/docutils/docutils/readers/__init__.py
===================================================================
--- trunk/docutils/docutils/readers/__init__.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/readers/__init__.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -124,9 +124,8 @@
@overload
-def get_reader_class(
- reader_name: Literal['standalone']
-) -> type[standalone.Reader]:
+def get_reader_class(reader_name: Literal['standalone']
+ ) -> type[standalone.Reader]:
...
Modified: trunk/docutils/docutils/statemachine.py
===================================================================
--- trunk/docutils/docutils/statemachine.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/statemachine.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -264,7 +264,7 @@
else:
transitions = None
state = self.get_state(next_state)
- except: # NoQA: E722
+ except: # NoQA: E722 (catchall)
if self.debug:
self.error()
raise
@@ -673,7 +673,7 @@
try:
del self.transitions[name]
self.transition_order.remove(name)
- except: # NoQA: E722
+ except: # NoQA: E722 (catchall)
raise UnknownTransitionError(name)
def make_transition(self, name, next_state=None):
Modified: trunk/docutils/docutils/transforms/frontmatter.py
===================================================================
--- trunk/docutils/docutils/transforms/frontmatter.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/transforms/frontmatter.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -416,7 +416,7 @@
field['classes'].append(classvalue)
docinfo.append(field)
nodelist = []
- if len(docinfo) != 0:
+ if len(docinfo):
nodelist.append(docinfo)
if topics['dedication']:
nodelist.append(topics['dedication'])
Modified: trunk/docutils/docutils/transforms/references.py
===================================================================
--- trunk/docutils/docutils/transforms/references.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/transforms/references.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -114,14 +114,11 @@
def apply(self) -> None:
anonymous_refs = [
- node for node
- in self.document.findall(nodes.reference)
+ node for node in self.document.findall(nodes.reference)
if node.get('anonymous')]
anonymous_targets = [
- node for node
- in self.document.findall(nodes.target)
- if node.get('anonymous')
- ]
+ node for node in self.document.findall(nodes.target)
+ if node.get('anonymous')]
if len(anonymous_refs) != len(anonymous_targets):
msg = self.document.reporter.error(
'Anonymous hyperlink mismatch: %s references but %s '
Modified: trunk/docutils/docutils/utils/__init__.py
===================================================================
--- trunk/docutils/docutils/utils/__init__.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/utils/__init__.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -682,11 +682,9 @@
if found == -1:
parts.append(text[start:])
return ''.join(parts)
- parts.extend((
- text[start:found],
- '\x00' + text[found + 1:found + 2],
- ))
- start = found + 2 # skip character after escape
+ parts.extend((text[start:found],
+ '\x00' + text[found + 1:found + 2]))
+ start = found + 2 # skip character after escape
def split_escaped_whitespace(text: str) -> list[str]:
@@ -781,11 +779,10 @@
subtags = list(tag.split('_'))
base_tag = (subtags.pop(0),)
# find all combinations of subtags
- taglist = [
- '-'.join(base_tag + tags)
- for n in range(len(subtags), 0, -1)
- for tags in itertools.combinations(subtags, n)
- ]
+ taglist = ['-'.join(base_tag + tags)
+ for n in range(len(subtags), 0, -1)
+ for tags in itertools.combinations(subtags, n)
+ ]
taglist += base_tag
return taglist
Modified: trunk/docutils/docutils/utils/math/tex2mathml_extern.py
===================================================================
--- trunk/docutils/docutils/utils/math/tex2mathml_extern.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/utils/math/tex2mathml_extern.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -171,12 +171,11 @@
details = []
if result.stderr:
lines = result.stderr.splitlines()
- details.extend((
- nodes.paragraph('', lines[0]),
- nodes.literal_block('', '\n'.join(lines[1:3])),
- nodes.paragraph('', '\n'.join(lines[3:]),
- classes=['pre-wrap']),
- ))
+ details += [nodes.paragraph('', lines[0]),
+ nodes.literal_block('', '\n'.join(lines[1:3])),
+ nodes.paragraph('', '\n'.join(lines[3:]),
+ classes=['pre-wrap']),
+ ]
_check_result(result, details=details)
return result.stdout
Modified: trunk/docutils/docutils/utils/smartquotes.py
===================================================================
--- trunk/docutils/docutils/utils/smartquotes.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/utils/smartquotes.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -911,7 +911,7 @@
try:
locale.setlocale(locale.LC_ALL, '') # set to user defaults
defaultlanguage = locale.getlocale()[0]
- except: # NoQA: E722
+ except: # NoQA: E722 (catchall)
defaultlanguage = 'en'
# Normalize and drop unsupported subtags:
Modified: trunk/docutils/docutils/writers/html4css1/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1/__init__.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/writers/html4css1/__init__.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -932,10 +932,8 @@
"""
def visit_list_item(self, node):
- children = [
- child for child in node.children
- if not isinstance(child, nodes.Invisible)
- ]
+ children = [child for child in node.children
+ if not isinstance(child, nodes.Invisible)]
if (children and isinstance(children[0], nodes.paragraph)
and (isinstance(children[-1], nodes.bullet_list)
or isinstance(children[-1], nodes.enumerated_list))):
Modified: trunk/docutils/docutils/writers/manpage.py
===================================================================
--- trunk/docutils/docutils/writers/manpage.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/docutils/writers/manpage.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -171,11 +171,10 @@
del cell_lines[-1]
def as_list(self):
- text = [
- '.TS\n',
- ' '.join(self._options) + ';\n',
- '%s.\n' % '|'.join(self._coldefs),
- ]
+ text = ['.TS\n',
+ ' '.join(self._options) + ';\n',
+ '%s.\n' % '|'.join(self._coldefs),
+ ]
for row in self._rows:
# row = array of cells. cell = array of lines.
text.append('T{\n')
Modified: trunk/docutils/test/alltests.py
===================================================================
--- trunk/docutils/test/alltests.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/test/alltests.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -12,7 +12,7 @@
All modules named 'test_*.py' in the current directory, and recursively in
subdirectories (packages) called 'test_*', are loaded and test suites within
are run.
-""" # NoQA: A001
+""" # NoQA: A001 (shadowing builtin `__doc__`)
import atexit
import platform
Modified: trunk/docutils/test/test_io.py
===================================================================
--- trunk/docutils/test/test_io.py 2024-08-09 13:37:52 UTC (rev 9880)
+++ trunk/docutils/test/test_io.py 2024-08-10 08:12:14 UTC (rev 9881)
@@ -31,7 +31,7 @@
SUPPRESS_ENCODING_WARNING = sys.flags.warn_default_encoding
else:
SUPPRESS_ENCODING_WARNING = False
- EncodingWarning = UnicodeWarning # NoQA: A001 (builtin name)
+ EncodingWarning = UnicodeWarning # NoQA: A001 (builtin in Py > 0.9)
# DATA_ROOT is ./test/data/ from the docutils root
DATA_ROOT = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.