Skip to content

Commit 1285028

Browse files
committed
test: Fix test_markup does not use default settings for docutils
1 parent 889eb99 commit 1285028

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

tests/test_markup.py

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from sphinx import addnodes
1010
from sphinx.builders.html.transforms import KeyboardTransform
1111
from sphinx.builders.latex import LaTeXBuilder
12+
from sphinx.environment import default_settings
1213
from sphinx.roles import XRefRole
1314
from sphinx.testing.util import Struct, assert_node
1415
from sphinx.transforms import SphinxSmartQuotes
@@ -22,13 +23,13 @@
2223
def settings(app):
2324
texescape.init() # otherwise done by the latex builder
2425
optparser = frontend.OptionParser(
25-
components=(RstParser, HTMLWriter, LaTeXWriter))
26+
components=(RstParser, HTMLWriter, LaTeXWriter),
27+
defaults=default_settings)
2628
settings = optparser.get_default_values()
2729
settings.smart_quotes = True
2830
settings.env = app.builder.env
2931
settings.env.temp_data['docname'] = 'dummy'
3032
settings.contentsname = 'dummy'
31-
settings.rfc_base_url = 'http://datatracker.ietf.org/doc/html/'
3233
domain_context = sphinx_domains(settings.env)
3334
domain_context.enable()
3435
yield settings
@@ -146,51 +147,49 @@ def get(name):
146147
@pytest.mark.parametrize('type,rst,html_expected,latex_expected', [
147148
(
148149
# pep role
149-
'verify_re',
150+
'verify',
150151
':pep:`8`',
151-
# since docutils-0.19, :pep: role points to python.org via https schema
152152
('<p><span class="target" id="index-0"></span><a class="pep reference external" '
153-
'href="https?://(www.python.org/dev/peps|peps.python.org)/pep-0008"><strong>PEP 8</strong></a></p>'),
154-
(r'\\sphinxAtStartPar\n'
155-
r'\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}'
156-
r'!PEP 8@\\spxentry{PEP 8}}\\sphinxhref{https?://(www.python.org/dev/peps|peps.python.org)/pep-0008}'
157-
r'{\\sphinxstylestrong{PEP 8}}')
153+
'href="https://peps.python.org/pep-0008"><strong>PEP 8</strong></a></p>'),
154+
('\\sphinxAtStartPar\n'
155+
'\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}'
156+
'!PEP 8@\\spxentry{PEP 8}}\\sphinxhref{https://peps.python.org/pep-0008}'
157+
'{\\sphinxstylestrong{PEP 8}}')
158158
),
159159
(
160160
# pep role with anchor
161-
'verify_re',
161+
'verify',
162162
':pep:`8#id1`',
163-
# since docutils-0.19, :pep: role points to python.org via https schema
164163
('<p><span class="target" id="index-0"></span><a class="pep reference external" '
165-
'href="https?://(www.python.org/dev/peps|peps.python.org)/pep-0008#id1">'
164+
'href="https://peps.python.org/pep-0008#id1">'
166165
'<strong>PEP 8#id1</strong></a></p>'),
167-
(r'\\sphinxAtStartPar\n'
168-
r'\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}'
169-
r'!PEP 8\\#id1@\\spxentry{PEP 8\\#id1}}\\sphinxhref'
170-
r'{https?://(www.python.org/dev/peps|peps.python.org)/pep-0008\\#id1}'
171-
r'{\\sphinxstylestrong{PEP 8\\#id1}}')
166+
('\\sphinxAtStartPar\n'
167+
'\\index{Python Enhancement Proposals@\\spxentry{Python Enhancement Proposals}'
168+
'!PEP 8\\#id1@\\spxentry{PEP 8\\#id1}}\\sphinxhref'
169+
'{https://peps.python.org/pep-0008\\#id1}'
170+
'{\\sphinxstylestrong{PEP 8\\#id1}}')
172171
),
173172
(
174173
# rfc role
175174
'verify',
176175
':rfc:`2324`',
177176
('<p><span class="target" id="index-0"></span><a class="rfc reference external" '
178-
'href="http://datatracker.ietf.org/doc/html/rfc2324.html"><strong>RFC 2324</strong></a></p>'),
177+
'href="https://datatracker.ietf.org/doc/html/rfc2324.html"><strong>RFC 2324</strong></a></p>'),
179178
('\\sphinxAtStartPar\n'
180179
'\\index{RFC@\\spxentry{RFC}!RFC 2324@\\spxentry{RFC 2324}}'
181-
'\\sphinxhref{http://datatracker.ietf.org/doc/html/rfc2324.html}'
180+
'\\sphinxhref{https://datatracker.ietf.org/doc/html/rfc2324.html}'
182181
'{\\sphinxstylestrong{RFC 2324}}')
183182
),
184183
(
185184
# rfc role with anchor
186185
'verify',
187186
':rfc:`2324#id1`',
188187
('<p><span class="target" id="index-0"></span><a class="rfc reference external" '
189-
'href="http://datatracker.ietf.org/doc/html/rfc2324.html#id1">'
188+
'href="https://datatracker.ietf.org/doc/html/rfc2324.html#id1">'
190189
'<strong>RFC 2324#id1</strong></a></p>'),
191190
('\\sphinxAtStartPar\n'
192191
'\\index{RFC@\\spxentry{RFC}!RFC 2324\\#id1@\\spxentry{RFC 2324\\#id1}}'
193-
'\\sphinxhref{http://datatracker.ietf.org/doc/html/rfc2324.html\\#id1}'
192+
'\\sphinxhref{https://datatracker.ietf.org/doc/html/rfc2324.html\\#id1}'
194193
'{\\sphinxstylestrong{RFC 2324\\#id1}}')
195194
),
196195
(

0 commit comments

Comments
 (0)