From: R. David Murray Date: Wed, 24 Feb 2010 02:11:08 +0000 (+0000) Subject: Merged revisions 78403 via svnmerge from X-Git-Tag: v3.2a1~1639 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04cace62e8a9514cee2e82bb747710dad8367a76;p=python Merged revisions 78403 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78403 | r.david.murray | 2010-02-23 21:08:28 -0500 (Tue, 23 Feb 2010) | 3 lines The primary copy of lib2to3 is not trunk, so the lib2to3 change should not have been included in the -OO patch, back it out. ........ --- diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index 7ed85dffb9..2263f50eeb 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -239,9 +239,6 @@ from __future__ import print_function""" finally: os.linesep = old_sep - - @unittest.skipIf(sys.flags.optimize >= 2, - "Docstrings are omitted with -O2 and above") def test_refactor_docstring(self): rt = self.rt()