Menu
▾
▴
[Docutils-checkins] SF.net SVN: docutils:[9018] trunk/docutils
|
From: <mi...@us...> - 2022-03-03 22:16:15
|
Revision: 9018
http://sourceforge.net/p/docutils/code/9018
Author: milde
Date: 2022-03-03 22:16:12 +0000 (Thu, 03 Mar 2022)
Log Message:
-----------
Fix missing whitespace after ',' or ':'.
flake8 rule E231.
Mostly trailing commas in list and dictionary literals.
Modified Paths:
--------------
trunk/docutils/docutils/parsers/rst/directives/__init__.py
trunk/docutils/docutils/parsers/rst/directives/tables.py
trunk/docutils/docutils/parsers/rst/languages/af.py
trunk/docutils/docutils/parsers/rst/languages/ca.py
trunk/docutils/docutils/parsers/rst/languages/cs.py
trunk/docutils/docutils/parsers/rst/languages/da.py
trunk/docutils/docutils/parsers/rst/languages/de.py
trunk/docutils/docutils/parsers/rst/languages/en.py
trunk/docutils/docutils/parsers/rst/languages/fi.py
trunk/docutils/docutils/parsers/rst/languages/fr.py
trunk/docutils/docutils/parsers/rst/languages/gl.py
trunk/docutils/docutils/parsers/rst/languages/he.py
trunk/docutils/docutils/parsers/rst/languages/it.py
trunk/docutils/docutils/parsers/rst/languages/ja.py
trunk/docutils/docutils/parsers/rst/languages/ko.py
trunk/docutils/docutils/parsers/rst/languages/lt.py
trunk/docutils/docutils/parsers/rst/languages/lv.py
trunk/docutils/docutils/parsers/rst/languages/nl.py
trunk/docutils/docutils/parsers/rst/languages/pl.py
trunk/docutils/docutils/parsers/rst/languages/pt_br.py
trunk/docutils/docutils/parsers/rst/languages/ru.py
trunk/docutils/docutils/parsers/rst/languages/sk.py
trunk/docutils/docutils/parsers/rst/languages/sv.py
trunk/docutils/docutils/parsers/rst/languages/zh_cn.py
trunk/docutils/docutils/parsers/rst/languages/zh_tw.py
trunk/docutils/docutils/parsers/rst/states.py
trunk/docutils/docutils/readers/__init__.py
trunk/docutils/docutils/transforms/frontmatter.py
trunk/docutils/docutils/utils/__init__.py
trunk/docutils/docutils/utils/math/latex2mathml.py
trunk/docutils/docutils/utils/math/math2html.py
trunk/docutils/docutils/utils/urischemes.py
trunk/docutils/docutils/writers/__init__.py
trunk/docutils/docutils/writers/latex2e/__init__.py
trunk/docutils/docutils/writers/pep_html/__init__.py
trunk/docutils/test/local_dummy_lang.py
trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py
trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py
trunk/docutils/test/test_parsers/test_rst/test_interpreted_fr.py
trunk/docutils/test/test_settings.py
trunk/docutils/test/test_transforms/test_docinfo.py
trunk/docutils/test/test_writers/test_html4css1_misc.py
trunk/docutils/test/test_writers/test_html4css1_template.py
trunk/docutils/test/test_writers/test_html5_polyglot_misc.py
trunk/docutils/test/test_writers/test_s5.py
trunk/docutils/tools/buildhtml.py
trunk/docutils/tox.ini
Modified: trunk/docutils/docutils/parsers/rst/directives/__init__.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/__init__.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/directives/__init__.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -64,7 +64,8 @@
'default-role': ('misc', 'DefaultRole'),
'title': ('misc', 'Title'),
'date': ('misc', 'Date'),
- 'restructuredtext-test-directive': ('misc', 'TestDirective'),}
+ 'restructuredtext-test-directive': ('misc', 'TestDirective'),
+ }
"""Mapping of directive name to (module name, class name). The
directive name is canonical & must be lowercase. Language-dependent
names are defined in the ``language`` subpackage."""
Modified: trunk/docutils/docutils/parsers/rst/directives/tables.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/directives/tables.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/directives/tables.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -192,7 +192,7 @@
# text field quote/unquote char:
'quote': directives.single_char_or_unicode,
# char used to escape delim & quote as-needed:
- 'escape': directives.single_char_or_unicode,}
+ 'escape': directives.single_char_or_unicode}
class DocutilsDialect(csv.Dialect):
Modified: trunk/docutils/docutils/parsers/rst/languages/af.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/af.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/af.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -101,6 +101,7 @@
'uri-verwysing': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'rou': 'raw',}
+ 'rou': 'raw',
+ }
"""Mapping of Afrikaans role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/ca.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/ca.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/ca.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -120,6 +120,7 @@
'refer\u00E8ncia-uri': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'cru': 'raw',}
+ 'cru': 'raw',
+ }
"""Mapping of Catalan role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/cs.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/cs.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/cs.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -103,6 +103,7 @@
'uri-reference (translation required)': 'uri-reference',
'uri (translation required)': 'uri-reference',
'url (translation required)': 'uri-reference',
- 'raw (translation required)': 'raw',}
+ 'raw (translation required)': 'raw',
+ }
"""Mapping of Czech role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/da.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/da.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/da.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -107,6 +107,7 @@
'uri-reference': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'rå': 'raw',}
+ 'rå': 'raw',
+ }
"""Mapping of Danish role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/de.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/de.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/de.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -99,6 +99,7 @@
'ziel': 'target',
'uri-referenz': 'uri-reference',
'unverändert': 'raw',
- 'roh': 'raw',}
+ 'roh': 'raw',
+ }
"""Mapping of German role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/en.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/en.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/en.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -105,6 +105,7 @@
'uri-reference': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'raw': 'raw',}
+ 'raw': 'raw',
+ }
"""Mapping of English role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/fi.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/fi.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/fi.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -92,6 +92,7 @@
'substitution-reference (translation required)': 'substitution-reference',
'kohde': 'target',
'uri-reference (translation required)': 'uri-reference',
- 'raw (translation required)': 'raw',}
+ 'raw (translation required)': 'raw',
+ }
"""Mapping of Finnish role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/fr.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/fr.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/fr.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -98,6 +98,7 @@
'substitution-r\u00E9f\u00E9rence': 'substitution-reference',
'lien': 'target',
'uri-r\u00E9f\u00E9rence': 'uri-reference',
- 'brut': 'raw',}
+ 'brut': 'raw',
+ }
"""Mapping of French role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/gl.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/gl.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/gl.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -105,6 +105,7 @@
'referencia-uri': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'cru': 'raw',}
+ 'cru': 'raw',
+ }
"""Mapping of Galician role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/he.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/he.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/he.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -103,6 +103,7 @@
'uri-reference': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'raw': 'raw',}
+ 'raw': 'raw',
+ }
"""Mapping of English role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/it.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/it.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/it.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -92,6 +92,7 @@
'riferimento-sostituzione': 'substitution-reference',
'destinazione': 'target',
'riferimento-uri': 'uri-reference',
- 'grezzo': 'raw',}
+ 'grezzo': 'raw',
+ }
"""Mapping of Italian role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/ja.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/ja.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/ja.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -113,6 +113,7 @@
'uri参照': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- '生': 'raw',}
+ '生': 'raw',
+ }
"""Mapping of Japanese role names to canonical role names for interpreted
text."""
Modified: trunk/docutils/docutils/parsers/rst/languages/ko.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/ko.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/ko.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -105,6 +105,7 @@
'uri-참조': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'raw': 'raw',}
+ 'raw': 'raw',
+ }
"""Mapping of Korean role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/lt.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/lt.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/lt.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -103,6 +103,7 @@
'uri-nuoroda': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'žalia': 'raw',}
+ 'žalia': 'raw',
+ }
"""Mapping of English role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/lv.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/lv.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/lv.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -102,6 +102,7 @@
'atsauce-uz-uri': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'burtiski': 'raw',}
+ 'burtiski': 'raw',
+ }
"""Mapping of English role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/nl.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/nl.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/nl.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -107,6 +107,7 @@
'uri-referentie': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'onbewerkt': 'raw',}
+ 'onbewerkt': 'raw',
+ }
"""Mapping of Dutch role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/pl.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/pl.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/pl.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -94,6 +94,7 @@
'referencja-uri': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'surowe': 'raw',}
+ 'surowe': 'raw',
+ }
"""Mapping of Polish role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/pt_br.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/pt_br.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/pt_br.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -103,6 +103,7 @@
'refer\u00EAncia-a-uri': 'uri-reference',
'uri': 'uri-reference',
'url': 'uri-reference',
- 'cru': 'raw',}
+ 'cru': 'raw',
+ }
"""Mapping of Brazilian Portuguese role names to canonical role names
for interpreted text."""
Modified: trunk/docutils/docutils/parsers/rst/languages/ru.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/ru.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/ru.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -58,7 +58,8 @@
'тема': 'topic',
'эпиграф': 'epigraph',
'header (translation required)': 'header',
- 'footer (translation required)': 'footer',}
+ 'footer (translation required)': 'footer',
+ }
"""Russian name to registered (in directives/__init__.py) directive name
mapping."""
@@ -83,6 +84,7 @@
'ссылка-на-сноску': 'footnote-reference',
'цитатная-ссылка': 'citation-reference',
'цель': 'target',
- 'сырой': 'raw',}
+ 'сырой': 'raw',
+ }
"""Mapping of Russian role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/sk.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/sk.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/sk.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -90,6 +90,7 @@
'substitution-reference (translation required)': 'substitution-reference',
'target (translation required)': 'target',
'uri-reference (translation required)': 'uri-reference',
- 'raw (translation required)': 'raw',}
+ 'raw (translation required)': 'raw',
+ }
"""Mapping of Slovak role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/sv.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/sv.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/sv.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -89,6 +89,7 @@
'ersättnings-referens': 'substitution-reference',
'mål': 'target',
'uri-referens': 'uri-reference',
- 'rå': 'raw',}
+ 'rå': 'raw',
+ }
"""Mapping of Swedish role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/docutils/parsers/rst/languages/zh_cn.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/zh_cn.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/zh_cn.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -98,6 +98,7 @@
'uri-reference (translation required)': 'uri-reference',
'uri (translation required)': 'uri-reference',
'url (translation required)': 'uri-reference',
- 'raw (translation required)': 'raw',}
+ 'raw (translation required)': 'raw',
+ }
"""Mapping of Simplified Chinese role names to canonical role names
for interpreted text."""
Modified: trunk/docutils/docutils/parsers/rst/languages/zh_tw.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/languages/zh_tw.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/languages/zh_tw.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -103,6 +103,7 @@
'uri-reference (translation required)': 'uri-reference',
'uri (translation required)': 'uri-reference',
'url (translation required)': 'uri-reference',
- 'raw (translation required)': 'raw',}
+ 'raw (translation required)': 'raw',
+ }
"""Mapping of Traditional Chinese role names to canonical role names for
interpreted text."""
Modified: trunk/docutils/docutils/parsers/rst/states.py
===================================================================
--- trunk/docutils/docutils/parsers/rst/states.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/parsers/rst/states.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -1094,7 +1094,7 @@
'loweralpha': '[a-z]',
'upperalpha': '[A-Z]',
'lowerroman': '[ivxlcdm]+',
- 'upperroman': '[IVXLCDM]+',}
+ 'upperroman': '[IVXLCDM]+'}
enum.converters = {'arabic': int,
'loweralpha': _loweralpha_to_int,
'upperalpha': _upperalpha_to_int,
Modified: trunk/docutils/docutils/readers/__init__.py
===================================================================
--- trunk/docutils/docutils/readers/__init__.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/readers/__init__.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -30,10 +30,9 @@
config_section = 'readers'
def get_transforms(self):
- return Component.get_transforms(self) + [
- universal.Decorations,
- universal.ExposeInternals,
- universal.StripComments,]
+ return Component.get_transforms(self) + [universal.Decorations,
+ universal.ExposeInternals,
+ universal.StripComments]
def __init__(self, parser=None, parser_name=None):
"""
Modified: trunk/docutils/docutils/transforms/frontmatter.py
===================================================================
--- trunk/docutils/docutils/transforms/frontmatter.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/transforms/frontmatter.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -471,7 +471,7 @@
(re.compile(r'\$' r'Date: (\d\d\d\d)[-/](\d\d)[-/](\d\d)[ T][\d:]+'
r'[^$]* \$', re.IGNORECASE), r'\1-\2-\3'),
(re.compile(r'\$' r'RCSfile: (.+),v \$', re.IGNORECASE), r'\1'),
- (re.compile(r'\$[a-zA-Z]+: (.+) \$'), r'\1'),]
+ (re.compile(r'\$[a-zA-Z]+: (.+) \$'), r'\1')]
def extract_authors(self, field, name, docinfo):
try:
Modified: trunk/docutils/docutils/utils/__init__.py
===================================================================
--- trunk/docutils/docutils/utils/__init__.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/utils/__init__.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -608,7 +608,7 @@
[3, 6, 9]
"""
- return [i for i,c in enumerate(text) if unicodedata.combining(c)]
+ return [i for i, c in enumerate(text) if unicodedata.combining(c)]
def column_indices(text):
"""Indices of Unicode string `text` when skipping combining characters.
@@ -752,7 +752,7 @@
'alpha': 'a',
'beta': 'b',
'candidate': 'rc',
- 'final': '',}
+ 'final': ''}
def version_identifier(version_info=None):
"""
Modified: trunk/docutils/docutils/utils/math/latex2mathml.py
===================================================================
--- trunk/docutils/docutils/utils/math/latex2mathml.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/utils/math/latex2mathml.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -44,10 +44,10 @@
# special case: Capital Greek letters: (upright in TeX style)
greek_capitals = {
- 'Phi':'\u03a6', 'Xi':'\u039e', 'Sigma':'\u03a3',
- 'Psi':'\u03a8', 'Delta':'\u0394', 'Theta':'\u0398',
- 'Upsilon':'\u03d2', 'Pi':'\u03a0', 'Omega':'\u03a9',
- 'Gamma':'\u0393', 'Lambda':'\u039b'}
+ 'Phi': '\u03a6', 'Xi': '\u039e', 'Sigma': '\u03a3',
+ 'Psi': '\u03a8', 'Delta': '\u0394', 'Theta': '\u0398',
+ 'Upsilon': '\u03d2', 'Pi': '\u03a0', 'Omega': '\u03a9',
+ 'Gamma': '\u0393', 'Lambda': '\u039b'}
# functions -> <mi>
functions = {# functions with a space in the name
@@ -160,8 +160,8 @@
# special cases
thick_operators = {# style='font-weight: bold;'
- 'thicksim': '\u223C', # ∼
- 'thickapprox':'\u2248', # ≈
+ 'thicksim': '\u223C', # ∼
+ 'thickapprox': '\u2248', # ≈
}
small_operators = {# mathsize='75%'
Modified: trunk/docutils/docutils/utils/math/math2html.py
===================================================================
--- trunk/docutils/docutils/utils/math/math2html.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/utils/math/math2html.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -82,24 +82,23 @@
"Configuration class from elyxer.config file"
extracttext = {
- 'allowed': ['FormulaConstant',],
- 'extracted': [
- 'AlphaCommand',
- 'Bracket',
- 'BracketCommand',
- 'CombiningFunction',
- 'EmptyCommand',
- 'FontFunction',
- 'Formula',
- 'FormulaNumber',
- 'FormulaSymbol',
- 'OneParamFunction',
- 'OversetFunction',
- 'RawText',
- 'SpacedCommand',
- 'SymbolFunction',
- 'TextFunction',
- 'UndersetFunction',
+ 'allowed': ['FormulaConstant'],
+ 'extracted': ['AlphaCommand',
+ 'Bracket',
+ 'BracketCommand',
+ 'CombiningFunction',
+ 'EmptyCommand',
+ 'FontFunction',
+ 'Formula',
+ 'FormulaNumber',
+ 'FormulaSymbol',
+ 'OneParamFunction',
+ 'OversetFunction',
+ 'RawText',
+ 'SpacedCommand',
+ 'SymbolFunction',
+ 'TextFunction',
+ 'UndersetFunction',
],
}
@@ -153,16 +152,16 @@
'rowseparator': r'\\',
}
- bigbrackets = {'(': ['⎛', '⎜', '⎝',],
- ')': ['⎞', '⎟', '⎠',],
- '[': ['⎡', '⎢', '⎣',],
- ']': ['⎤', '⎥', '⎦',],
- '{': ['⎧', '⎪', '⎨', '⎩',],
- '}': ['⎫', '⎪', '⎬', '⎭',],
+ bigbrackets = {'(': ['⎛', '⎜', '⎝'],
+ ')': ['⎞', '⎟', '⎠'],
+ '[': ['⎡', '⎢', '⎣'],
+ ']': ['⎤', '⎥', '⎦'],
+ '{': ['⎧', '⎪', '⎨', '⎩'],
+ '}': ['⎫', '⎪', '⎬', '⎭'],
# TODO: 2-row brackets with ⎰⎱ (\lmoustache \rmoustache)
- '|': ['|',], # 007C VERTICAL LINE
- # '|': ['⎮',], # 23AE INTEGRAL EXTENSION
- # '|': ['⎪',], # 23AA CURLY BRACKET EXTENSION
+ '|': ['|'], # 007C VERTICAL LINE
+ # '|': ['⎮'], # 23AE INTEGRAL EXTENSION
+ # '|': ['⎪'], # 23AA CURLY BRACKET EXTENSION
'‖': ['‖'], # 2016 DOUBLE VERTICAL LINE
# '∥': ['∥'], # 2225 PARALLEL TO
}
@@ -324,10 +323,10 @@
}
environments = {
- 'align': ['r', 'l',],
- 'eqnarray': ['r', 'c', 'l',],
- 'gathered': ['l', 'l',],
- 'smallmatrix': ['c', 'c',],
+ 'align': ['r', 'l'],
+ 'eqnarray': ['r', 'c', 'l'],
+ 'gathered': ['l', 'l'],
+ 'smallmatrix': ['c', 'c'],
}
fontfunctions = {
@@ -361,51 +360,51 @@
}
hybridfunctions = {
- '\\addcontentsline': ['{$p!}{$q!}{$r!}', 'f0{}', 'ignored',],
- '\\addtocontents': ['{$p!}{$q!}', 'f0{}', 'ignored',],
- '\\backmatter': ['', 'f0{}', 'ignored',],
- '\\binom': ['{$1}{$2}', 'f2{(}f0{f1{$1}f1{$2}}f2{)}', 'span class="binom"', 'span class="binomstack"', 'span class="bigdelimiter size2"',],
- '\\boxed': ['{$1}', 'f0{$1}', 'span class="boxed"',],
- '\\cfrac': ['[$p!]{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="fullfraction"', 'span class="numerator align-$p"', 'span class="denominator"', 'span class="ignored"',],
- '\\color': ['{$p!}{$1}', 'f0{$1}', 'span style="color: $p;"',],
- '\\colorbox': ['{$p!}{$1}', 'f0{$1}', 'span class="colorbox" style="background: $p;"',],
- '\\dbinom': ['{$1}{$2}', '(f0{f1{f2{$1}}f1{f2{ }}f1{f2{$2}}})', 'span class="binomial"', 'span class="binomrow"', 'span class="binomcell"',],
- '\\dfrac': ['{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="fullfraction"', 'span class="numerator"', 'span class="denominator"', 'span class="ignored"',],
- '\\displaystyle': ['{$1}', 'f0{$1}', 'span class="displaystyle"',],
- '\\fancyfoot': ['[$p!]{$q!}', 'f0{}', 'ignored',],
- '\\fancyhead': ['[$p!]{$q!}', 'f0{}', 'ignored',],
- '\\fbox': ['{$1}', 'f0{$1}', 'span class="fbox"',],
- '\\fboxrule': ['{$p!}', 'f0{}', 'ignored',],
- '\\fboxsep': ['{$p!}', 'f0{}', 'ignored',],
- '\\fcolorbox': ['{$p!}{$q!}{$1}', 'f0{$1}', 'span class="boxed" style="border-color: $p; background: $q;"',],
- '\\frac': ['{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="fraction"', 'span class="numerator"', 'span class="denominator"', 'span class="ignored"',],
- '\\framebox': ['[$p!][$q!]{$1}', 'f0{$1}', 'span class="framebox align-$q" style="width: $p;"',],
- '\\frontmatter': ['', 'f0{}', 'ignored',],
- '\\href': ['[$o]{$u!}{$t!}', 'f0{$t}', 'a href="$u"',],
- '\\hspace': ['{$p!}', 'f0{ }', 'span class="hspace" style="width: $p;"',],
- '\\leftroot': ['{$p!}', 'f0{ }', 'span class="leftroot" style="width: $p;px"',],
+ '\\addcontentsline': ['{$p!}{$q!}{$r!}', 'f0{}', 'ignored'],
+ '\\addtocontents': ['{$p!}{$q!}', 'f0{}', 'ignored'],
+ '\\backmatter': ['', 'f0{}', 'ignored'],
+ '\\binom': ['{$1}{$2}', 'f2{(}f0{f1{$1}f1{$2}}f2{)}', 'span class="binom"', 'span class="binomstack"', 'span class="bigdelimiter size2"'],
+ '\\boxed': ['{$1}', 'f0{$1}', 'span class="boxed"'],
+ '\\cfrac': ['[$p!]{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="fullfraction"', 'span class="numerator align-$p"', 'span class="denominator"', 'span class="ignored"'],
+ '\\color': ['{$p!}{$1}', 'f0{$1}', 'span style="color: $p;"'],
+ '\\colorbox': ['{$p!}{$1}', 'f0{$1}', 'span class="colorbox" style="background: $p;"'],
+ '\\dbinom': ['{$1}{$2}', '(f0{f1{f2{$1}}f1{f2{ }}f1{f2{$2}}})', 'span class="binomial"', 'span class="binomrow"', 'span class="binomcell"'],
+ '\\dfrac': ['{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="fullfraction"', 'span class="numerator"', 'span class="denominator"', 'span class="ignored"'],
+ '\\displaystyle': ['{$1}', 'f0{$1}', 'span class="displaystyle"'],
+ '\\fancyfoot': ['[$p!]{$q!}', 'f0{}', 'ignored'],
+ '\\fancyhead': ['[$p!]{$q!}', 'f0{}', 'ignored'],
+ '\\fbox': ['{$1}', 'f0{$1}', 'span class="fbox"'],
+ '\\fboxrule': ['{$p!}', 'f0{}', 'ignored'],
+ '\\fboxsep': ['{$p!}', 'f0{}', 'ignored'],
+ '\\fcolorbox': ['{$p!}{$q!}{$1}', 'f0{$1}', 'span class="boxed" style="border-color: $p; background: $q;"'],
+ '\\frac': ['{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="fraction"', 'span class="numerator"', 'span class="denominator"', 'span class="ignored"'],
+ '\\framebox': ['[$p!][$q!]{$1}', 'f0{$1}', 'span class="framebox align-$q" style="width: $p;"'],
+ '\\frontmatter': ['', 'f0{}', 'ignored'],
+ '\\href': ['[$o]{$u!}{$t!}', 'f0{$t}', 'a href="$u"'],
+ '\\hspace': ['{$p!}', 'f0{ }', 'span class="hspace" style="width: $p;"'],
+ '\\leftroot': ['{$p!}', 'f0{ }', 'span class="leftroot" style="width: $p;px"'],
# TODO: convert 1 mu to 1/18 em
- # '\\mspace': ['{$p!}', 'f0{ }', 'span class="hspace" style="width: $p;"',],
- '\\nicefrac': ['{$1}{$2}', 'f0{f1{$1}⁄f2{$2}}', 'span class="fraction"', 'sup class="numerator"', 'sub class="denominator"', 'span class="ignored"',],
- '\\parbox': ['[$p!]{$w!}{$1}', 'f0{1}', 'div class="Boxed" style="width: $w;"',],
- '\\raisebox': ['{$p!}{$1}', 'f0{$1.font}', 'span class="raisebox" style="vertical-align: $p;"',],
- '\\renewenvironment': ['{$1!}{$2!}{$3!}', '',],
- '\\rule': ['[$v!]{$w!}{$h!}', 'f0/', 'hr class="line" style="width: $w; height: $h;"',],
- '\\scriptscriptstyle': ['{$1}', 'f0{$1}', 'span class="scriptscriptstyle"',],
- '\\scriptstyle': ['{$1}', 'f0{$1}', 'span class="scriptstyle"',],
+ # '\\mspace': ['{$p!}', 'f0{ }', 'span class="hspace" style="width: $p;"'],
+ '\\nicefrac': ['{$1}{$2}', 'f0{f1{$1}⁄f2{$2}}', 'span class="fraction"', 'sup class="numerator"', 'sub class="denominator"', 'span class="ignored"'],
+ '\\parbox': ['[$p!]{$w!}{$1}', 'f0{1}', 'div class="Boxed" style="width: $w;"'],
+ '\\raisebox': ['{$p!}{$1}', 'f0{$1.font}', 'span class="raisebox" style="vertical-align: $p;"'],
+ '\\renewenvironment': ['{$1!}{$2!}{$3!}', ''],
+ '\\rule': ['[$v!]{$w!}{$h!}', 'f0/', 'hr class="line" style="width: $w; height: $h;"'],
+ '\\scriptscriptstyle': ['{$1}', 'f0{$1}', 'span class="scriptscriptstyle"'],
+ '\\scriptstyle': ['{$1}', 'f0{$1}', 'span class="scriptstyle"'],
# TODO: increase √-size with argument (\frac in display mode, ...)
- '\\sqrt': ['[$0]{$1}', 'f0{f1{$0}f2{√}f4{(}f3{$1}f4{)}}', 'span class="sqrt"', 'sup class="root"', 'span class="radical"', 'span class="root"', 'span class="ignored"',],
- '\\stackrel': ['{$1}{$2}', 'f0{f1{$1}f2{$2}}', 'span class="stackrel"', 'span class="upstackrel"', 'span class="downstackrel"',],
- '\\tbinom': ['{$1}{$2}', '(f0{f1{f2{$1}}f1{f2{ }}f1{f2{$2}}})', 'span class="binomial"', 'span class="binomrow"', 'span class="binomcell"',],
- '\\tfrac': ['{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="textfraction"', 'span class="numerator"', 'span class="denominator"', 'span class="ignored"',],
- '\\textcolor': ['{$p!}{$1}', 'f0{$1}', 'span style="color: $p;"',],
- '\\textstyle': ['{$1}', 'f0{$1}', 'span class="textstyle"',],
- '\\thispagestyle': ['{$p!}', 'f0{}', 'ignored',],
- '\\unit': ['[$0]{$1}', '$0f0{$1.font}', 'span class="unit"',],
- '\\unitfrac': ['[$0]{$1}{$2}', '$0f0{f1{$1.font}⁄f2{$2.font}}', 'span class="fraction"', 'sup class="unit"', 'sub class="unit"',],
- '\\uproot': ['{$p!}', 'f0{ }', 'span class="uproot" style="width: $p;px"',],
- '\\url': ['{$u!}', 'f0{$u}', 'a href="$u"',],
- '\\vspace': ['{$p!}', 'f0{ }', 'span class="vspace" style="height: $p;"',],
+ '\\sqrt': ['[$0]{$1}', 'f0{f1{$0}f2{√}f4{(}f3{$1}f4{)}}', 'span class="sqrt"', 'sup class="root"', 'span class="radical"', 'span class="root"', 'span class="ignored"'],
+ '\\stackrel': ['{$1}{$2}', 'f0{f1{$1}f2{$2}}', 'span class="stackrel"', 'span class="upstackrel"', 'span class="downstackrel"'],
+ '\\tbinom': ['{$1}{$2}', '(f0{f1{f2{$1}}f1{f2{ }}f1{f2{$2}}})', 'span class="binomial"', 'span class="binomrow"', 'span class="binomcell"'],
+ '\\tfrac': ['{$1}{$2}', 'f0{f3{(}f1{$1}f3{)/(}f2{$2}f3{)}}', 'span class="textfraction"', 'span class="numerator"', 'span class="denominator"', 'span class="ignored"'],
+ '\\textcolor': ['{$p!}{$1}', 'f0{$1}', 'span style="color: $p;"'],
+ '\\textstyle': ['{$1}', 'f0{$1}', 'span class="textstyle"'],
+ '\\thispagestyle': ['{$p!}', 'f0{}', 'ignored'],
+ '\\unit': ['[$0]{$1}', '$0f0{$1.font}', 'span class="unit"'],
+ '\\unitfrac': ['[$0]{$1}{$2}', '$0f0{f1{$1.font}⁄f2{$2.font}}', 'span class="fraction"', 'sup class="unit"', 'sub class="unit"'],
+ '\\uproot': ['{$p!}', 'f0{ }', 'span class="uproot" style="width: $p;px"'],
+ '\\url': ['{$u!}', 'f0{$u}', 'a href="$u"'],
+ '\\vspace': ['{$p!}', 'f0{ }', 'span class="vspace" style="height: $p;"'],
}
hybridsizes = {
@@ -2586,7 +2585,7 @@
class BeginCommand(CommandBit):
"A \\begin{}...\\end command and what it entails (array, cases, aligned)"
- commandmap = {FormulaConfig.array['begin']:''}
+ commandmap = {FormulaConfig.array['begin']: ''}
types = [FormulaEquation, FormulaArray, FormulaCases, FormulaMatrix]
Modified: trunk/docutils/docutils/utils/urischemes.py
===================================================================
--- trunk/docutils/docutils/utils/urischemes.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/utils/urischemes.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -133,4 +133,5 @@
'xmlrpc.beep': 'RFC 3529',
'xmlrpc.beeps': 'RFC 3529',
'z39.50r': 'Z39.50 Retrieval; RFC 2056',
- 'z39.50s': 'Z39.50 Session; RFC 2056',}
+ 'z39.50s': 'Z39.50 Session; RFC 2056',
+ }
Modified: trunk/docutils/docutils/writers/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/__init__.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/writers/__init__.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -32,9 +32,9 @@
def get_transforms(self):
return Component.get_transforms(self) + [
- universal.Messages,
- universal.FilterMessages,
- universal.StripClassesAndElements,]
+ universal.Messages,
+ universal.FilterMessages,
+ universal.StripClassesAndElements]
document = None
"""The document to write (Docutils doctree); set by `write`."""
Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -2148,11 +2148,11 @@
def visit_enumerated_list(self, node):
# enumeration styles:
types = {'': '',
- 'arabic':'arabic',
- 'loweralpha':'alph',
- 'upperalpha':'Alph',
- 'lowerroman':'roman',
- 'upperroman':'Roman'}
+ 'arabic': 'arabic',
+ 'loweralpha': 'alph',
+ 'upperalpha': 'Alph',
+ 'lowerroman': 'roman',
+ 'upperroman': 'Roman'}
# default LaTeX enumeration labels:
default_labels = [# (präfix, enumtype, suffix)
('', 'arabic', '.'), # 1.
@@ -2408,7 +2408,8 @@
# block level images:
'center': (r'\noindent\makebox[\linewidth][c]{', '}'),
'left': (r'\noindent{', r'\hfill}'),
- 'right': (r'\noindent{\hfill', '}'),}
+ 'right': (r'\noindent{\hfill', '}'),
+ }
if 'align' in attrs:
# TODO: warn or ignore non-applicable alignment settings?
try:
Modified: trunk/docutils/docutils/writers/pep_html/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/pep_html/__init__.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/docutils/writers/pep_html/__init__.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -48,7 +48,7 @@
{'action': 'store_true', 'validator': frontend.validate_boolean}),))
settings_default_overrides = {'stylesheet_path': default_stylesheet_path,
- 'template': default_template_path,}
+ 'template': default_template_path}
relative_path_settings = ('template',)
Modified: trunk/docutils/test/local_dummy_lang.py
===================================================================
--- trunk/docutils/test/local_dummy_lang.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/local_dummy_lang.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -149,6 +149,6 @@
'dummy uri-reference': 'uri-reference',
'dummy uri': 'uri-reference',
'dummy url': 'uri-reference',
- 'dummy raw': 'raw',}
+ 'dummy raw': 'raw'}
"""Mapping of English role names to canonical role names for interpreted text.
"""
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_long.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -14,7 +14,7 @@
from docutils.utils.code_analyzer import with_pygments
def suite():
- settings = {'syntax_highlight':'long'}
+ settings = {'syntax_highlight': 'long'}
s = DocutilsTestSupport.ParserTestSuite(suite_settings=settings)
if with_pygments:
s.generateTests(totest)
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_code_none.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -13,7 +13,8 @@
from test_parsers import DocutilsTestSupport
def suite():
- s = DocutilsTestSupport.ParserTestSuite(suite_settings={'syntax_highlight':'none'})
+ s = DocutilsTestSupport.ParserTestSuite(
+ suite_settings={'syntax_highlight': 'none'})
s.generateTests(totest)
return s
Modified: trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_parsers/test_rst/test_directives/test_replace_fr.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -15,7 +15,8 @@
def suite():
- s = DocutilsTestSupport.ParserTestSuite(suite_settings={'language_code':'fr'})
+ s = DocutilsTestSupport.ParserTestSuite(
+ suite_settings={'language_code': 'fr'})
s.generateTests(totest)
return s
Modified: trunk/docutils/test/test_parsers/test_rst/test_interpreted_fr.py
===================================================================
--- trunk/docutils/test/test_parsers/test_rst/test_interpreted_fr.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_parsers/test_rst/test_interpreted_fr.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -15,7 +15,8 @@
def suite():
- s = DocutilsTestSupport.ParserTestSuite(suite_settings={'language_code':'fr'})
+ s = DocutilsTestSupport.ParserTestSuite(
+ suite_settings={'language_code': 'fr'})
s.generateTests(totest)
return s
Modified: trunk/docutils/test/test_settings.py
===================================================================
--- trunk/docutils/test/test_settings.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_settings.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -300,9 +300,9 @@
def test_validate_colon_separated_string_list(self):
tests = (
- ('a', ['a',]),
+ ('a', ['a']),
('a:b', ['a', 'b']),
- (['a',], ['a',]),
+ (['a'], ['a']),
(['a', 'b:c'], ['a', 'b', 'c']),
)
for t in tests:
@@ -312,9 +312,9 @@
def test_validate_comma_separated_list(self):
tests = (
- ('a', ['a',]),
+ ('a', ['a']),
('a,b', ['a', 'b']),
- (['a',], ['a',]),
+ (['a'], ['a']),
(['a', 'b,c'], ['a', 'b', 'c']),
)
for t in tests:
Modified: trunk/docutils/test/test_transforms/test_docinfo.py
===================================================================
--- trunk/docutils/test/test_transforms/test_docinfo.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_transforms/test_docinfo.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -419,7 +419,8 @@
Abstract 1.
<comment xml:space="preserve">
Bibliographic element extraction for a German document.
-"""],])
+"""]
+])
totest_ru['bibliographic_field_lists'] = ((DocInfo,), [
["""\
@@ -462,7 +463,8 @@
Abstract 1.
<comment xml:space="preserve">
Bibliographic element extraction for a Russian document.
-"""],])
+"""]
+])
if __name__ == '__main__':
Modified: trunk/docutils/test/test_writers/test_html4css1_misc.py
===================================================================
--- trunk/docutils/test/test_writers/test_html4css1_misc.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_writers/test_html4css1_misc.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -80,7 +80,7 @@
def test_default_stylesheet(self):
# default style sheet, embedded
- mys = {'_disable_config': True,}
+ mys = {'_disable_config': True}
styles = core.publish_parts(self.data, writer_name='html4css1',
settings_overrides=mys)['stylesheet']
self.assertIn('Default cascading style sheet '
@@ -151,7 +151,7 @@
def test_math_output_default(self):
# HTML with math.css stylesheet (since 0.11)
- mys = {'_disable_config': True,}
+ mys = {'_disable_config': True}
styles = core.publish_parts(self.data, writer_name='html4css1',
settings_overrides=mys)['stylesheet']
self.assertIn('convert LaTeX equations to HTML output.', styles)
Modified: trunk/docutils/test/test_writers/test_html4css1_template.py
===================================================================
--- trunk/docutils/test/test_writers/test_html4css1_template.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_writers/test_html4css1_template.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -20,7 +20,7 @@
settings = {'template': os.path.join(DocutilsTestSupport.testroot,
'data', 'full-template.txt'),
'stylesheet_path': '/test.css',
- 'embed_stylesheet': 0,}
+ 'embed_stylesheet': 0}
s = DocutilsTestSupport.PublishTestSuite('html', suite_settings=settings)
s.generateTests(totest)
return s
Modified: trunk/docutils/test/test_writers/test_html5_polyglot_misc.py
===================================================================
--- trunk/docutils/test/test_writers/test_html5_polyglot_misc.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_writers/test_html5_polyglot_misc.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -79,7 +79,7 @@
def test_default_stylesheet(self):
# default style sheet, embedded
- mys = {'_disable_config': True,}
+ mys = {'_disable_config': True}
styles = core.publish_parts(self.data, writer_name='html5_polyglot',
settings_overrides=mys)['stylesheet']
self.assertIn('Minimal style sheet '
@@ -160,7 +160,7 @@
def test_math_output_default(self):
# HTML with math.css stylesheet (since 0.11)
- mys = {'_disable_config': True,}
+ mys = {'_disable_config': True}
styles = core.publish_parts(self.data, writer_name='html5_polyglot',
settings_overrides=mys)['stylesheet']
self.assertIn('convert LaTeX equations to HTML output.', styles)
Modified: trunk/docutils/test/test_writers/test_s5.py
===================================================================
--- trunk/docutils/test/test_writers/test_s5.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/test/test_writers/test_s5.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -18,7 +18,7 @@
def suite():
settings = {'stylesheet_path': '/test.css',
- 'embed_stylesheet': 0,}
+ 'embed_stylesheet': 0}
s = DocutilsTestSupport.PublishTestSuite('s5', suite_settings=settings)
s.generateTests(totest_1)
settings['hidden_controls'] = 0
Modified: trunk/docutils/tools/buildhtml.py
===================================================================
--- trunk/docutils/tools/buildhtml.py 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/tools/buildhtml.py 2022-03-03 22:16:12 UTC (rev 9018)
@@ -68,7 +68,7 @@
['--prune'],
{'metavar': '<directory>', 'action': 'append',
'validator': frontend.validate_colon_separated_string_list,
- 'default': prune_default,}),
+ 'default': prune_default}),
('Recursively ignore files matching any of the given '
'wildcard (shell globbing) patterns (separated by colons).',
['--ignore'],
@@ -85,7 +85,7 @@
(frontend.SUPPRESS_HELP, # Obsoleted by "--writer"
['--html-writer'],
{'metavar': '<writer>',
- 'choices': ['html', 'html4', 'html5'],}),
+ 'choices': ['html', 'html4', 'html5']}),
('Work silently (no progress messages). Independent of "--quiet".',
['--silent'],
{'action': 'store_true', 'validator': frontend.validate_boolean}),
Modified: trunk/docutils/tox.ini
===================================================================
--- trunk/docutils/tox.ini 2022-03-03 22:15:34 UTC (rev 9017)
+++ trunk/docutils/tox.ini 2022-03-03 22:16:12 UTC (rev 9018)
@@ -38,7 +38,7 @@
# whitespace around the operators with the lowest priority(ies).
# Use your own judgment; …"
- E231, # missing whitespace after ','
+ #E231, # missing whitespace after ','
E241, # multiple spaces after ':'
E251, # unexpected spaces around keyword / parameter equals
E261, # at least two spaces before inline comment
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
