--- MERGE: merged r4444 to maintenance branch; original log message:

    updated tests for revision 4443 (support for new python.org and pep2pyramid.py)

git-svn-id: http://svn.code.sf.net/p/docutils/code/branches/docutils-0.4@4486 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

6 files changed, 14 insertions, 14 deletions

diff --git a/test/functional/expected/pep_html.html b/test/functional/expected/pep_html.html
index a1e6d461a..1c4deafb3 100644
--- a/test/functional/expected/pep_html.html
+++ b/test/functional/expected/pep_html.html
@@ -21,7 +21,7 @@ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
  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/peps/">PEP Index</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="document">
@@ -35,7 +35,7 @@ to templates.  DO NOT USE THIS HTML FILE AS YOUR TEMPLATE!
 </tr>
 <tr class="field"><th class="field-name">Version:</th><td class="field-body">42</td>
 </tr>
-<tr class="field"><th class="field-name">Last-Modified:</th><td class="field-body"><a class="reference" href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/python/nondist/peps/pep-0100.txt">A long time ago.</a></td>
+<tr class="field"><th class="field-name">Last-Modified:</th><td class="field-body"><a class="reference" href="http://svn.python.org/view/*checkout*/peps/trunk/pep-0100.txt">A long time ago.</a></td>
 </tr>
 <tr class="field"><th class="field-name">Author:</th><td class="field-body">John Doe &lt;john&#32;&#97;t&#32;example.org&gt;</td>
 </tr>
@@ -45,7 +45,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" href="http://www.python.org/peps/pep-0012.html">text/x-rst</a></td>
+<tr class="field"><th class="field-name">Content-Type:</th><td class="field-body"><a class="reference" href="http://www.python.org/dev/peps/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/test/functional/expected/standalone_rst_html4css1.html b/test/functional/expected/standalone_rst_html4css1.html
index a3710e779..0ee1044e1 100644
--- a/test/functional/expected/standalone_rst_html4css1.html
+++ b/test/functional/expected/standalone_rst_html4css1.html
@@ -175,7 +175,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" href="#doctitle">doctitle</a> and the <a class="reference" 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" href="http://www.python.org/peps/pep-0287.html">PEP 287</a>); an
+some explicit interpreted text roles: a PEP reference (<a class="reference" href="http://www.python.org/dev/peps/pep-0287.html">PEP 287</a>); an
 RFC reference (<a class="reference" href="http://www.faqs.org/rfcs/rfc2822.html">RFC 2822</a>); a <sub>subscript</sub>; a <sup>superscript</sup>;
 and explicit roles for <em>standard</em> <strong>inline</strong>
 <tt class="docutils literal"><span class="pre">markup</span></tt>.</p>
diff --git a/test/functional/expected/standalone_rst_latex.tex b/test/functional/expected/standalone_rst_latex.tex
index 49d33a277..433b8d400 100644
--- a/test/functional/expected/standalone_rst_latex.tex
+++ b/test/functional/expected/standalone_rst_latex.tex
@@ -312,7 +312,7 @@ inline markup is also possible (although exceedingly ugly!) in \emph{re}\texttt{
 reference to the \href{\#doctitle}{doctitle} and the \href{\#subtitle}{subtitle}.
 
 The default role for interpreted text is \titlereference{Title Reference}.  Here are
-some explicit interpreted text roles: a PEP reference (\href{http://www.python.org/peps/pep-0287.html}{PEP 287}); an
+some explicit interpreted text roles: a PEP reference (\href{http://www.python.org/dev/peps/pep-0287.html}{PEP 287}); an
 RFC reference (\href{http://www.faqs.org/rfcs/rfc2822.html}{RFC 2822}); a $_{subscript}$; a $^{superscript}$;
 and explicit roles for \emph{standard} \textbf{inline}
 \texttt{markup}.
diff --git a/test/functional/expected/standalone_rst_pseudoxml.txt b/test/functional/expected/standalone_rst_pseudoxml.txt
index 193f8c37c..ed4562462 100644
--- a/test/functional/expected/standalone_rst_pseudoxml.txt
+++ b/test/functional/expected/standalone_rst_pseudoxml.txt
@@ -470,7 +470,7 @@
                         Title Reference
                     .  Here are
                     some explicit interpreted text roles: a PEP reference (
-                    <reference refuri="http://www.python.org/peps/pep-0287.html">
+                    <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
                         PEP 287
                     ); an
                     RFC reference (
diff --git a/test/test_parsers/test_rst/test_interpreted.py b/test/test_parsers/test_rst/test_interpreted.py
index a5392d497..aa342d573 100755
--- a/test/test_parsers/test_rst/test_interpreted.py
+++ b/test/test_parsers/test_rst/test_interpreted.py
@@ -182,7 +182,7 @@ totest['references'] = [
 """\
 <document source="test data">
     <paragraph>
-        <reference refuri="http://www.python.org/peps/pep-0000.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0000.html">
             PEP 0
 """],
 ["""\
diff --git a/test/test_readers/test_pep/test_inline_markup.py b/test/test_readers/test_pep/test_inline_markup.py
index 4965af3d1..80b100593 100755
--- a/test/test_readers/test_pep/test_inline_markup.py
+++ b/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="http://www.python.org/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
             PEP 287
          (
-        <reference refuri="http://www.python.org/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
             pep-0287.txt
         ),
         and \n\
@@ -61,7 +61,7 @@ RFC
     <paragraph>
         References split across lines:
     <paragraph>
-        <reference refuri="http://www.python.org/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
             PEP
             287
     <paragraph>
@@ -72,18 +72,18 @@ RFC
 ["""\
 Test PEP-specific implicit references before a URL:
 
-PEP 287 (http://www.python.org/peps/pep-0287.html), RFC 2822.
+PEP 287 (http://www.python.org/dev/peps/pep-0287.html), RFC 2822.
 """,
 """\
 <document source="test data">
     <paragraph>
         Test PEP-specific implicit references before a URL:
     <paragraph>
-        <reference refuri="http://www.python.org/peps/pep-0287.html">
+        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
             PEP 287
          (
-        <reference refuri="http://www.python.org/peps/pep-0287.html">
-            http://www.python.org/peps/pep-0287.html
+        <reference refuri="http://www.python.org/dev/peps/pep-0287.html">
+            http://www.python.org/dev/peps/pep-0287.html
         ), \n\
         <reference refuri="http://www.faqs.org/rfcs/rfc2822.html">
             RFC 2822