diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-03-13 18:04:05 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2022-03-13 18:04:05 +0000 |
| commit | 78e51d9d3a67d6cd95b31e75b754007146543739 (patch) | |
| tree | ed934998cb6ba157edc9f5bfe5bcd93c9be99536 | |
| parent | 50c9ea9e004549f103986e234d2cccf871d2b0ee (diff) | |
| download | docutils-78e51d9d3a67d6cd95b31e75b754007146543739.tar.gz | |
Update PEP base URL and template.
The canonical PEP base URL changed to "peps.python.org/".
The PEP-writer template.txt added a "source" link that no longer
works due to sources now only be stored on github and having
two possible file extensions ("txt" or "rst").
Adapt the header to resemble the header of official PEP documents
(which are now produced using Sphinx).
Fixes [bug:#445].
git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9045 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
20 files changed, 53 insertions, 57 deletions
diff --git a/docutils/HISTORY.txt b/docutils/HISTORY.txt index 9bef48833..469758a56 100644 --- a/docutils/HISTORY.txt +++ b/docutils/HISTORY.txt @@ -45,7 +45,8 @@ Changes Since 0.18.1 * docutils/parsers/rst/__init__.py - - use "https:" scheme in PEP and RFC base link defaults. + - Update PEP base URL (fixes bug #445), + use "https:" scheme in RFC base URL. - Add `reporter` to `Directive` class attributes. * docutils/parsers/rst/directives/__init__.py @@ -62,9 +63,9 @@ Changes Since 0.18.1 * docutils/utils/__init__.py - - decode_path() returns `str` instance instead of `nodes.reprunicode`. - - new function error_string() obsoletes utils.error_reporting.ErrorString. - - class ErrorOutput moved here from docutils/utils/error_reporting.py + - `decode_path()` returns `str` instance instead of `nodes.reprunicode`. + - New function error_string() obsoletes utils.error_reporting.ErrorString. + - Class `ErrorOutput` moved here from docutils/utils/error_reporting.py * docutils/utils/error_reporting.py @@ -77,12 +78,13 @@ Changes Since 0.18.1 * docutils/writers/pep_html/ - - use "https:" scheme in "python_home" URL default. + - Use "https:" scheme in "python_home" URL default. + - Fix links in template.txt. * test/DocutilsTestSupport.py - - exception_data() now returns None if no exception was raised. - - recommonmark_wrapper only imported if upstream parser is present. + - `exception_data()` now returns None if no exception was raised. + - `recommonmark_wrapper` only imported if upstream parser is present. * test/test_parsers/test_rst/test_directives/test_tables.py diff --git a/docutils/RELEASE-NOTES.txt b/docutils/RELEASE-NOTES.txt index 27cc838e5..9b86682ad 100644 --- a/docutils/RELEASE-NOTES.txt +++ b/docutils/RELEASE-NOTES.txt @@ -102,6 +102,8 @@ Docutils 0.19 is compatible with Python versions 3.7 and later. * The default values for the "pep-references", "rfc-base-url", and "python-home" `configuration settings`_ now uses the "https:" scheme. + The PEP-writer template's header is updated to fix links and + resemble the header of official PEPs. .. _configuration settings: docs/user/config.html diff --git a/docutils/docs/user/config.txt b/docutils/docs/user/config.txt index e5fd50b29..0af775003 100644 --- a/docutils/docs/user/config.txt +++ b/docutils/docs/user/config.txt @@ -695,7 +695,7 @@ pep_base_url ~~~~~~~~~~~~ Base URL for PEP references. -Default: "https://www.python.org/dev/peps/". +Default: "https://peps.python.org/". Option: ``--pep-base-url``. pep_file_url_template diff --git a/docutils/docutils/parsers/rst/__init__.py b/docutils/docutils/parsers/rst/__init__.py index 7d714bc1f..197bf1c8e 100644 --- a/docutils/docutils/parsers/rst/__init__.py +++ b/docutils/docutils/parsers/rst/__init__.py @@ -91,9 +91,9 @@ class Parser(docutils.parsers.Parser): ['--pep-references'], {'action': 'store_true', 'validator': frontend.validate_boolean}), ('Base URL for PEP references ' - '(default "https://www.python.org/dev/peps/").', + '(default "https://peps.python.org/").', ['--pep-base-url'], - {'metavar': '<URL>', 'default': 'https://www.python.org/dev/peps/', + {'metavar': '<URL>', 'default': 'https://peps.python.org/', 'validator': frontend.validate_url_trailing_slash}), ('Template for PEP file part of URL. (default "pep-%04d")', ['--pep-file-url-template'], diff --git a/docutils/docutils/writers/pep_html/template.txt b/docutils/docutils/writers/pep_html/template.txt index ec18d8812..990151d44 100644 --- a/docutils/docutils/writers/pep_html/template.txt +++ b/docutils/docutils/writers/pep_html/template.txt @@ -3,27 +3,23 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- This HTML is auto-generated. DO NOT EDIT THIS FILE! If you are writing a new -PEP, see http://www.python.org/dev/peps/pep-0001 for instructions and links +PEP, see http://peps.python.org/pep-0001 for instructions and links to templates. DO NOT USE THIS HTML FILE AS YOUR TEMPLATE! --> <head> <meta http-equiv="Content-Type" content="text/html; charset=%(encoding)s" /> <meta name="generator" content="Docutils %(version)s: https://docutils.sourceforge.io/" /> - <title>PEP %(pep)s -- %(title)s</title> + <title>PEP %(pep)s - %(title)s</title> %(stylesheet)s </head> <body bgcolor="white"> -<table class="navigation" cellpadding="0" cellspacing="0" - width="100%%" border="0"> -<tr><td class="navicon" width="150" height="35"> -<a href="%(pyhome)s/" title="Python Home Page"> -<img src="%(pyhome)s/pics/PyBanner%(banner)03d.gif" alt="[Python]" - border="0" width="150" height="35" /></a></td> -<td class="textlinks" align="left"> -[<b><a href="%(pyhome)s/">Python Home</a></b>] -[<b><a href="%(pepindex)s/">PEP Index</a></b>] -[<b><a href="%(pephome)s/pep-%(pepnum)s.txt">PEP Source</a></b>] -</td></tr></table> +<div class="header"> +<strong>Python Enhancement Proposals</strong> +| <a href="%(pyhome)s/">Python</a> +» <a href="https://peps.python.org/pep-0000/">PEP Index</a> +» PEP %(pep)s – %(title)s +<hr class="header"/> +</div> <div class="document"> %(body)s %(body_suffix)s diff --git a/docutils/test/functional/expected/latex_literal_block.tex b/docutils/test/functional/expected/latex_literal_block.tex index 0af1feffb..55317941a 100644 --- a/docutils/test/functional/expected/latex_literal_block.tex +++ b/docutils/test/functional/expected/latex_literal_block.tex @@ -137,7 +137,7 @@ footnote~references\DUfootnotemark{footnote-reference-1}{footnote-1}{*},\\ citation~references~(\hyperlink{cit2002}{[CIT2002]}),~and~more.\\ ~\\ ~~~Here~are~some~explicit~interpreted~text~roles:\\ -a~PEP~reference~(\href{https://www.python.org/dev/peps/pep-0287}{PEP~287}),\\ +a~PEP~reference~(\href{https://peps.python.org/pep-0287}{PEP~287}),\\ an~RFC~reference~(\href{https://tools.ietf.org/html/rfc2822.html}{RFC~2822}),\\ an~abbreviation~(\DUrole{abbreviation}{abb.}),~an~acronym~(\DUrole{acronym}{reST}),\\ code~(\texttt{\DUrole{code}{print~\textquotedbl{}hello~world\textquotedbl{}}}),\\ diff --git a/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex b/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex index 5202938aa..081166ec0 100644 --- a/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex +++ b/docutils/test/functional/expected/latex_literal_block_fancyvrb.tex @@ -137,7 +137,7 @@ footnote~references\DUfootnotemark{footnote-reference-1}{footnote-1}{*},\\ citation~references~(\hyperlink{cit2002}{[CIT2002]}),~and~more.\\ ~\\ ~~~Here~are~some~explicit~interpreted~text~roles:\\ -a~PEP~reference~(\href{https://www.python.org/dev/peps/pep-0287}{PEP~287}),\\ +a~PEP~reference~(\href{https://peps.python.org/pep-0287}{PEP~287}),\\ an~RFC~reference~(\href{https://tools.ietf.org/html/rfc2822.html}{RFC~2822}),\\ an~abbreviation~(\DUrole{abbreviation}{abb.}),~an~acronym~(\DUrole{acronym}{reST}),\\ code~(\texttt{\DUrole{code}{print~\textquotedbl{}hello~world\textquotedbl{}}}),\\ diff --git a/docutils/test/functional/expected/latex_literal_block_listings.tex b/docutils/test/functional/expected/latex_literal_block_listings.tex index 5c2a8347e..6c499a8c4 100644 --- a/docutils/test/functional/expected/latex_literal_block_listings.tex +++ b/docutils/test/functional/expected/latex_literal_block_listings.tex @@ -140,7 +140,7 @@ footnote~references\DUfootnotemark{footnote-reference-1}{footnote-1}{*},\\ citation~references~(\hyperlink{cit2002}{[CIT2002]}),~and~more.\\ ~\\ ~~~Here~are~some~explicit~interpreted~text~roles:\\ -a~PEP~reference~(\href{https://www.python.org/dev/peps/pep-0287}{PEP~287}),\\ +a~PEP~reference~(\href{https://peps.python.org/pep-0287}{PEP~287}),\\ an~RFC~reference~(\href{https://tools.ietf.org/html/rfc2822.html}{RFC~2822}),\\ an~abbreviation~(\DUrole{abbreviation}{abb.}),~an~acronym~(\DUrole{acronym}{reST}),\\ code~(\texttt{\DUrole{code}{print~\textquotedbl{}hello~world\textquotedbl{}}}),\\ diff --git a/docutils/test/functional/expected/latex_literal_block_verbatim.tex b/docutils/test/functional/expected/latex_literal_block_verbatim.tex index d36ded8c5..61739ec9b 100644 --- a/docutils/test/functional/expected/latex_literal_block_verbatim.tex +++ b/docutils/test/functional/expected/latex_literal_block_verbatim.tex @@ -136,7 +136,7 @@ footnote~references\DUfootnotemark{footnote-reference-1}{footnote-1}{*},\\ citation~references~(\hyperlink{cit2002}{[CIT2002]}),~and~more.\\ ~\\ ~~~Here~are~some~explicit~interpreted~text~roles:\\ -a~PEP~reference~(\href{https://www.python.org/dev/peps/pep-0287}{PEP~287}),\\ +a~PEP~reference~(\href{https://peps.python.org/pep-0287}{PEP~287}),\\ an~RFC~reference~(\href{https://tools.ietf.org/html/rfc2822.html}{RFC~2822}),\\ an~abbreviation~(\DUrole{abbreviation}{abb.}),~an~acronym~(\DUrole{acronym}{reST}),\\ code~(\texttt{\DUrole{code}{print~\textquotedbl{}hello~world\textquotedbl{}}}),\\ diff --git a/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex b/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex index 62433285c..3b733ccea 100644 --- a/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex +++ b/docutils/test/functional/expected/latex_literal_block_verbatimtab.tex @@ -137,7 +137,7 @@ footnote~references\DUfootnotemark{footnote-reference-1}{footnote-1}{*},\\ citation~references~(\hyperlink{cit2002}{[CIT2002]}),~and~more.\\ ~\\ ~~~Here~are~some~explicit~interpreted~text~roles:\\ -a~PEP~reference~(\href{https://www.python.org/dev/peps/pep-0287}{PEP~287}),\\ +a~PEP~reference~(\href{https://peps.python.org/pep-0287}{PEP~287}),\\ an~RFC~reference~(\href{https://tools.ietf.org/html/rfc2822.html}{RFC~2822}),\\ an~abbreviation~(\DUrole{abbreviation}{abb.}),~an~acronym~(\DUrole{acronym}{reST}),\\ code~(\texttt{\DUrole{code}{print~\textquotedbl{}hello~world\textquotedbl{}}}),\\ diff --git a/docutils/test/functional/expected/latex_memoir.tex b/docutils/test/functional/expected/latex_memoir.tex index 0b61ef79e..bf0bc94ca 100644 --- a/docutils/test/functional/expected/latex_memoir.tex +++ b/docutils/test/functional/expected/latex_memoir.tex @@ -345,7 +345,7 @@ inline markup is also possible (although exceedingly ugly!) in \emph{re}\texttt{ reference to the \hyperref[doctitle]{doctitle} and the \hyperref[subtitle]{subtitle}. The default role for interpreted text is \DUroletitlereference{Title Reference}. Here are -some explicit interpreted text roles: a PEP reference (\href{https://www.python.org/dev/peps/pep-0287}{PEP 287}); an +some explicit interpreted text roles: a PEP reference (\href{https://peps.python.org/pep-0287}{PEP 287}); an RFC reference (\href{https://tools.ietf.org/html/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym (\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print \textquotedbl{}hello world\textquotedbl{}}}); a \textsubscript{subscript}; a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}' diff --git a/docutils/test/functional/expected/pep_html.html b/docutils/test/functional/expected/pep_html.html index e45d17dc8..584edd793 100644 --- a/docutils/test/functional/expected/pep_html.html +++ b/docutils/test/functional/expected/pep_html.html @@ -3,27 +3,23 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <!-- This HTML is auto-generated. DO NOT EDIT THIS FILE! If you are writing a new -PEP, see http://www.python.org/dev/peps/pep-0001 for instructions and links +PEP, see http://peps.python.org/pep-0001 for instructions and links to templates. DO NOT USE THIS HTML FILE AS YOUR TEMPLATE! --> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="Docutils 0.19b.dev: https://docutils.sourceforge.io/" /> - <title>PEP 100 -- Test PEP</title> + <title>PEP 100 - Test PEP</title> <link rel="stylesheet" href="../input/data/html4css1.css" type="text/css" /> </head> <body bgcolor="white"> -<table class="navigation" cellpadding="0" cellspacing="0" - width="100%" border="0"> -<tr><td class="navicon" width="150" height="35"> -<a href="http://www.python.org/" title="Python Home Page"> -<img src="http://www.python.org/pics/PyBanner000.gif" alt="[Python]" - border="0" width="150" height="35" /></a></td> -<td class="textlinks" align="left"> -[<b><a href="http://www.python.org/">Python Home</a></b>] -[<b><a href="http://www.python.org/dev/peps/">PEP Index</a></b>] -[<b><a href="http://www.python.org/peps/pep-0100.txt">PEP Source</a></b>] -</td></tr></table> +<div class="header"> +<strong>Python Enhancement Proposals</strong> +| <a href="http://www.python.org/">Python</a> +» <a href="https://peps.python.org/pep-0000/">PEP Index</a> +» PEP 100 – Test PEP +<hr class="header"/> +</div> <div class="document"> <table class="rfc2822 docutils field-list" frame="void" rules="none"> <col class="field-name" /> @@ -45,7 +41,7 @@ to templates. DO NOT USE THIS HTML FILE AS YOUR TEMPLATE! </tr> <tr class="field"><th class="field-name">Type:</th><td class="field-body">Standards Track</td> </tr> -<tr class="field"><th class="field-name">Content-Type:</th><td class="field-body"><a class="reference external" href="https://www.python.org/dev/peps/pep-0012">text/x-rst</a></td> +<tr class="field"><th class="field-name">Content-Type:</th><td class="field-body"><a class="reference external" href="https://peps.python.org/pep-0012">text/x-rst</a></td> </tr> <tr class="field"><th class="field-name">Created:</th><td class="field-body">01-Jun-2001</td> </tr> diff --git a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml index 7e7db9661..496fba000 100644 --- a/docutils/test/functional/expected/standalone_rst_docutils_xml.xml +++ b/docutils/test/functional/expected/standalone_rst_docutils_xml.xml @@ -255,7 +255,7 @@ They are transformed from section titles after parsing.</comment> <target anonymous="1" ids="target-1" refuri="http://www.python.org/"></target> <target anonymous="1" ids="target-2" refuri="https://docutils.sourceforge.io/"></target> <paragraph>The default role for interpreted text is <title_reference>Title Reference</title_reference>. Here are - some explicit interpreted text roles: a PEP reference (<reference refuri="https://www.python.org/dev/peps/pep-0287">PEP 287</reference>); an + some explicit interpreted text roles: a PEP reference (<reference refuri="https://peps.python.org/pep-0287">PEP 287</reference>); an RFC reference (<reference refuri="https://tools.ietf.org/html/rfc2822.html">RFC 2822</reference>); an abbreviation (<abbreviation>abb.</abbreviation>), an acronym (<acronym>reST</acronym>), code (<literal classes="code">print "hello world"</literal>); a <subscript>subscript</subscript>; a <superscript>superscript</superscript> and explicit roles for <title_reference>Docutils</title_reference>' diff --git a/docutils/test/functional/expected/standalone_rst_html4css1.html b/docutils/test/functional/expected/standalone_rst_html4css1.html index e62dc57dc..24e7f78bd 100644 --- a/docutils/test/functional/expected/standalone_rst_html4css1.html +++ b/docutils/test/functional/expected/standalone_rst_html4css1.html @@ -185,7 +185,7 @@ inline markup is also possible (although exceedingly ugly!) in <em>re</em><tt cl (generated by processing errors; this one is intentional). Here is a reference to the <a class="reference internal" href="#doctitle">doctitle</a> and the <a class="reference internal" href="#subtitle">subtitle</a>.</p> <p>The default role for interpreted text is <cite>Title Reference</cite>. Here are -some explicit interpreted text roles: a PEP reference (<a class="reference external" href="https://www.python.org/dev/peps/pep-0287">PEP 287</a>); an +some explicit interpreted text roles: a PEP reference (<a class="reference external" href="https://peps.python.org/pep-0287">PEP 287</a>); an RFC reference (<a class="reference external" href="https://tools.ietf.org/html/rfc2822.html">RFC 2822</a>); an abbreviation (<abbr>abb.</abbr>), an acronym (<acronym>reST</acronym>), code (<code>print "hello world"</code>); a <sub>subscript</sub>; a <sup>superscript</sup> and explicit roles for <cite>Docutils</cite>' diff --git a/docutils/test/functional/expected/standalone_rst_html5.html b/docutils/test/functional/expected/standalone_rst_html5.html index a108cfbc6..827867399 100644 --- a/docutils/test/functional/expected/standalone_rst_html5.html +++ b/docutils/test/functional/expected/standalone_rst_html5.html @@ -203,7 +203,7 @@ inline markup is also possible (although exceedingly ugly!) in <em>re</em><span (generated by processing errors; this one is intentional). Here is a reference to the <a class="reference internal" href="#doctitle">doctitle</a> and the <a class="reference internal" href="#subtitle">subtitle</a>.</p> <p>The default role for interpreted text is <cite>Title Reference</cite>. Here are -some explicit interpreted text roles: a PEP reference (<a class="reference external" href="https://www.python.org/dev/peps/pep-0287">PEP 287</a>); an +some explicit interpreted text roles: a PEP reference (<a class="reference external" href="https://peps.python.org/pep-0287">PEP 287</a>); an RFC reference (<a class="reference external" href="https://tools.ietf.org/html/rfc2822.html">RFC 2822</a>); an abbreviation (<abbr>abb.</abbr>), an acronym (<abbr>reST</abbr>), code (<code>print "hello world"</code>); a <sub>subscript</sub>; a <sup>superscript</sup> and explicit roles for <cite>Docutils</cite>' diff --git a/docutils/test/functional/expected/standalone_rst_latex.tex b/docutils/test/functional/expected/standalone_rst_latex.tex index 19b22139e..7cfd004d2 100644 --- a/docutils/test/functional/expected/standalone_rst_latex.tex +++ b/docutils/test/functional/expected/standalone_rst_latex.tex @@ -346,7 +346,7 @@ inline markup is also possible (although exceedingly ugly!) in \emph{re}\texttt{ reference to the \hyperref[doctitle]{doctitle} and the \hyperref[subtitle]{subtitle}. The default role for interpreted text is \DUroletitlereference{Title Reference}. Here are -some explicit interpreted text roles: a PEP reference (\href{https://www.python.org/dev/peps/pep-0287}{PEP 287}); an +some explicit interpreted text roles: a PEP reference (\href{https://peps.python.org/pep-0287}{PEP 287}); an RFC reference (\href{https://tools.ietf.org/html/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym (\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print \textquotedbl{}hello world\textquotedbl{}}}); a \textsubscript{subscript}; a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}’ diff --git a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt index 1e4f7762c..f7296e418 100644 --- a/docutils/test/functional/expected/standalone_rst_pseudoxml.txt +++ b/docutils/test/functional/expected/standalone_rst_pseudoxml.txt @@ -505,7 +505,7 @@ Title Reference . Here are some explicit interpreted text roles: a PEP reference ( - <reference refuri="https://www.python.org/dev/peps/pep-0287"> + <reference refuri="https://peps.python.org/pep-0287"> PEP 287 ); an RFC reference ( diff --git a/docutils/test/functional/expected/standalone_rst_xetex.tex b/docutils/test/functional/expected/standalone_rst_xetex.tex index 46d65a7c0..3e79c606d 100644 --- a/docutils/test/functional/expected/standalone_rst_xetex.tex +++ b/docutils/test/functional/expected/standalone_rst_xetex.tex @@ -347,7 +347,7 @@ inline markup is also possible (although exceedingly ugly!) in \emph{re}\texttt{ reference to the \hyperref[doctitle]{doctitle} and the \hyperref[subtitle]{subtitle}. The default role for interpreted text is \DUroletitlereference{Title Reference}. Here are -some explicit interpreted text roles: a PEP reference (\href{https://www.python.org/dev/peps/pep-0287}{PEP 287}); an +some explicit interpreted text roles: a PEP reference (\href{https://peps.python.org/pep-0287}{PEP 287}); an RFC reference (\href{https://tools.ietf.org/html/rfc2822.html}{RFC 2822}); an abbreviation (\DUrole{abbreviation}{abb.}), an acronym (\DUrole{acronym}{reST}), code (\texttt{\DUrole{code}{print \textquotedbl{}hello world\textquotedbl{}}}); a \textsubscript{subscript}; a \textsuperscript{superscript} and explicit roles for \DUroletitlereference{Docutils}’ diff --git a/docutils/test/test_parsers/test_rst/test_interpreted.py b/docutils/test/test_parsers/test_rst/test_interpreted.py index 5f7b76f6e..945146317 100755 --- a/docutils/test/test_parsers/test_rst/test_interpreted.py +++ b/docutils/test/test_parsers/test_rst/test_interpreted.py @@ -302,7 +302,7 @@ totest['references'] = [ """\ <document source="test data"> <paragraph> - <reference refuri="https://www.python.org/dev/peps/pep-0000"> + <reference refuri="https://peps.python.org/pep-0000"> PEP 0 """], ["""\ diff --git a/docutils/test/test_readers/test_pep/test_inline_markup.py b/docutils/test/test_readers/test_pep/test_inline_markup.py index 4ec7b0fff..b2a5ea77f 100755 --- a/docutils/test/test_readers/test_pep/test_inline_markup.py +++ b/docutils/test/test_readers/test_pep/test_inline_markup.py @@ -30,10 +30,10 @@ and RFC 2822 (which obsoletes RFC822 and RFC-733). <document source="test data"> <paragraph> See \n\ - <reference refuri="https://www.python.org/dev/peps/pep-0287"> + <reference refuri="https://peps.python.org/pep-0287"> PEP 287 ( - <reference refuri="https://www.python.org/dev/peps/pep-0287"> + <reference refuri="https://peps.python.org/pep-0287"> pep-0287.txt ), and \n\ @@ -61,7 +61,7 @@ RFC <paragraph> References split across lines: <paragraph> - <reference refuri="https://www.python.org/dev/peps/pep-0287"> + <reference refuri="https://peps.python.org/pep-0287"> PEP 287 <paragraph> @@ -72,18 +72,18 @@ RFC ["""\ Test PEP-specific implicit references before a URL: -PEP 287 (https://www.python.org/dev/peps/pep-0287), RFC 2822. +PEP 287 (https://peps.python.org/pep-0287), RFC 2822. """, """\ <document source="test data"> <paragraph> Test PEP-specific implicit references before a URL: <paragraph> - <reference refuri="https://www.python.org/dev/peps/pep-0287"> + <reference refuri="https://peps.python.org/pep-0287"> PEP 287 ( - <reference refuri="https://www.python.org/dev/peps/pep-0287"> - https://www.python.org/dev/peps/pep-0287 + <reference refuri="https://peps.python.org/pep-0287"> + https://peps.python.org/pep-0287 ), \n\ <reference refuri="https://tools.ietf.org/html/rfc2822.html"> RFC 2822 |