[Python-checkins] r78410 - in python/branches/py3k: Lib/lib2to3/tests/test_refactor.py

Wed Feb 24 03:28:05 CET 2010

Author: benjamin.peterson
Date: Wed Feb 24 03:28:05 2010
New Revision: 78410
Log:
Merged revisions 78408 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
................
 r78408 | benjamin.peterson | 2010年02月23日 20:24:35 -0600 (2010年2月23日) | 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 (2010年2月23日) | 1 line
 
 rewrite test to not rely on __doc__ being present
 ........
................
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/lib2to3/tests/test_refactor.py
Modified: python/branches/py3k/Lib/lib2to3/tests/test_refactor.py
==============================================================================

--- python/branches/py3k/Lib/lib2to3/tests/test_refactor.py	(original)
+++ python/branches/py3k/Lib/lib2to3/tests/test_refactor.py	Wed Feb 24 03:28:05 2010
@@ -242,21 +242,19 @@
 def test_refactor_docstring(self):
 rt = self.rt()
 
- def example():
- """
- >>> example()
- 42
- """
- out = rt.refactor_docstring(example.__doc__, "<test>")
- self.assertEqual(out, example.__doc__)
+ doc = """
+>>> example()
+42
+"""
+ out = rt.refactor_docstring(doc, "<test>")
+ self.assertEqual(out, doc)
 
- def parrot():
- """
- >>> def parrot():
- ... return 43
- """
- out = rt.refactor_docstring(parrot.__doc__, "<test>")
- self.assertNotEqual(out, parrot.__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
