From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 30 Jul 2013 18:42:40 +0000 (-0400)
Subject: #18584: s/testcleanup/testsetup/ until we switch to Sphinx 1.1.
X-Git-Tag: v3.4.0a1~37^2~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11bfd32881e9d57072d3ffee253f5c34535d5042;p=thirdparty%2FPython%2Fcpython.git

#18584: s/testcleanup/testsetup/ until we switch to Sphinx 1.1.

testcleanup directive is new as of 1.1, and we are currently running
1.0.7.  But using testsetup works just as well, and avoids the
unknown directive error when building the docs.
---

diff --git a/Doc/library/email.iterators.rst b/Doc/library/email.iterators.rst
index 6c7200f98af4..7882718695a8 100644
--- a/Doc/library/email.iterators.rst
+++ b/Doc/library/email.iterators.rst
@@ -68,7 +68,7 @@ The following function has been added as a useful debugging tool.  It should
                   text/plain
           text/plain
 
-   .. testcleanup::
+   .. testsetup::
 
       >>> somefile.close()
 
diff --git a/Doc/library/email.policy.rst b/Doc/library/email.policy.rst
index d85054ac8339..54ebb1cf1118 100644
--- a/Doc/library/email.policy.rst
+++ b/Doc/library/email.policy.rst
@@ -85,7 +85,7 @@ file on disk and pass it to the system ``sendmail`` program on a Unix system:
    >>> p.stdin.close()
    >>> rc = p.wait()
 
-.. testcleanup::
+.. testsetup::
 
    >>> mymsg.close()
    >>> mocker.stop()