From b61a04d72aab94a427513099d09edab0e7a9c90e Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 24 Feb 2010 02:31:20 +0000 Subject: Merged revisions 78410 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78410 | benjamin.peterson | 2010-02-23 20:28:05 -0600 (Tue, 23 Feb 2010) | 16 lines 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 ........ ................ ................ --- Lib/lib2to3/tests/test_refactor.py | 28 +++++++++++++--------------- 1 file 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__, "") - self.assertEqual(out, example.__doc__) - - def parrot(): - """ - >>> def parrot(): - ... return 43 - """ - out = rt.refactor_docstring(parrot.__doc__, "") - self.assertNotEqual(out, parrot.__doc__) + doc = """ +>>> example() +42 +""" + out = rt.refactor_docstring(doc, "") + self.assertEqual(out, doc) + + doc = """ +>>> def parrot(): +... return 43 +""" + out = rt.refactor_docstring(doc, "") + self.assertNotEqual(out, doc) def test_explicit(self): from myfixes.fix_explicit import FixExplicit -- cgit v0.12