summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-02-24 02:28:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-02-24 02:28:05 (GMT)
commit54551092b5ffea57e3b99fa7ae28718aebadd902 (patch)
treea3e1ff04c77099ec29f8b90d9c99aebc7684cb1b
parent04cace62e8a9514cee2e82bb747710dad8367a76 (diff)
downloadcpython-54551092b5ffea57e3b99fa7ae28718aebadd902.zip
cpython-54551092b5ffea57e3b99fa7ae28718aebadd902.tar.gz
cpython-54551092b5ffea57e3b99fa7ae28718aebadd902.tar.bz2
Merged revisions 78408 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ................ r78408 | benjamin.peterson | 2010-02-23 20:24:35 -0600 (Tue, 23 Feb 2010) | 9 lines Merged revisions 78407 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r78407 | benjamin.peterson | 2010-02-23 20:21:34 -0600 (Tue, 23 Feb 2010) | 1 line rewrite test to not rely on __doc__ being present ........ ................
-rw-r--r--Lib/lib2to3/tests/test_refactor.py28
1 files changed, 13 insertions, 15 deletions
diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py
index 2263f50..49fb0c0 100644
--- a/Lib/lib2to3/tests/test_refactor.py
+++ b/Lib/lib2to3/tests/test_refactor.py
@@ -242,21 +242,19 @@ from __future__ import print_function"""
def test_refactor_docstring(self):
rt = self.rt()
- def example():
- """
- >>> example()
- 42
- """
- out = rt.refactor_docstring(example.__doc__, "<test>")
- self.assertEqual(out, example.__doc__)
-
- def parrot():
- """
- >>> def parrot():
- ... return 43
- """
- out = rt.refactor_docstring(parrot.__doc__, "<test>")
- self.assertNotEqual(out, parrot.__doc__)
+ doc = """
+>>> example()
+42
+"""
+ out = rt.refactor_docstring(doc, "<test>")
+ self.assertEqual(out, doc)
+
+ doc = """
+>>> def parrot():
+... return 43
+"""
+ out = rt.refactor_docstring(doc, "<test>")
+ self.assertNotEqual(out, doc)
def test_explicit(self):
from myfixes.fix_explicit import FixExplicit