From 54551092b5ffea57e3b99fa7ae28718aebadd902 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 24 Feb 2010 02:28:05 +0000 Subject: [PATCH] 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 | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index 2263f50eeb7..49fb0c044d4 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -242,21 +242,19 @@ def test_crlf_newlines(self): def test_refactor_docstring(self): rt = self.rt() - def example(): - """ - >>> example() - 42 - """ - out = rt.refactor_docstring(example.__doc__, "") - self.assertEqual(out, example.__doc__) + doc = """ +>>> example() +42 +""" + out = rt.refactor_docstring(doc, "") + self.assertEqual(out, doc) - def parrot(): - """ - >>> def parrot(): - ... return 43 - """ - out = rt.refactor_docstring(parrot.__doc__, "") - self.assertNotEqual(out, parrot.__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