The primary copy of lib2to3 is not trunk, so the lib2to3 change

should not have been included in the -OO patch, back it out.

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()