summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-07-30 18:43:10 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-07-30 18:43:10 (GMT)
commit20ac14fbada54df7e16e50d2f010329e0b14d4fd (patch)
tree06377e91b26f85e75f565d6a689e152d1f6dfd5b /Doc
parent8547a0e29be7c16bb3d45077f1e95bf7ba313a77 (diff)
parent11bfd32881e9d57072d3ffee253f5c34535d5042 (diff)
downloadcpython-20ac14fbada54df7e16e50d2f010329e0b14d4fd.zip
cpython-20ac14fbada54df7e16e50d2f010329e0b14d4fd.tar.gz
cpython-20ac14fbada54df7e16e50d2f010329e0b14d4fd.tar.bz2
Merge #18584: s/testcleanup/testsetup/ until we switch to Sphinx 1.1.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/email.iterators.rst2
-rw-r--r--Doc/library/email.policy.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/email.iterators.rst b/Doc/library/email.iterators.rst
index 6c7200f..7882718 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 d85054a..54ebb1c 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()