# HG changeset patch
# User John Beck <John.Beck@Oracle.COM>
# Date 1425494574 28800
# Node ID 397b904fa22edf4a44bb7ecc5c03d55d2daf686d
# Parent  7dda4f1294c81d91be3b1bef530ca1561a830eb0
20358297 Python 2.7 test_doctest fails in verbose mode

diff -r 7dda4f1294c8 -r 397b904fa22e components/python/python27/patches/23-doctest.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python27/patches/23-doctest.patch	Wed Mar 04 10:42:54 2015 -0800
@@ -0,0 +1,23 @@
+This patch was developed in-house and has been submitted upstream:
+http://bugs.python.org/issue23584
+
+--- Python-2.7.9/Lib/test/test_doctest.py.~1~	2015-02-27 13:14:35.000000000 -0800
++++ Python-2.7.9/Lib/test/test_doctest.py	2015-03-04 08:19:15.863620533 -0800
+@@ -2581,7 +2581,7 @@
+     >>> import tempfile, os
+     >>> fn = tempfile.mktemp()
+     >>> open(fn, 'w').write('Test:\r\n\r\n  >>> x = 1 + 1\r\n\r\nDone.\r\n')
+-    >>> doctest.testfile(fn, False)
++    >>> doctest.testfile(fn, False, verbose=False)
+     TestResults(failed=0, attempted=1)
+     >>> os.remove(fn)
+ 
+@@ -2589,7 +2589,7 @@
+ 
+     >>> fn = tempfile.mktemp()
+     >>> open(fn, 'w').write('Test:\n\n  >>> x = 1 + 1\n\nDone.\n')
+-    >>> doctest.testfile(fn, False)
++    >>> doctest.testfile(fn, False, verbose=False)
+     TestResults(failed=0, attempted=1)
+     >>> os.remove(fn)
+ 
diff -r 7dda4f1294c8 -r 397b904fa22e components/python/python27/test/results-32.master
--- a/components/python/python27/test/results-32.master	Wed Mar 04 08:51:31 2015 -0800
+++ b/components/python/python27/test/results-32.master	Wed Mar 04 10:42:54 2015 -0800
@@ -1,6 +1,6 @@
-357 tests OK.
-4 tests failed:
-    test_ctypes test_doctest test_multiprocessing test_re
+358 tests OK.
+3 tests failed:
+    test_ctypes test_multiprocessing test_re
 39 tests skipped:
     test_aepack test_al test_applesingle test_bsddb test_bsddb185
     test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk
@@ -15,9 +15,9 @@
     test_bsddb3 test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp
     test_codecmaps_kr test_codecmaps_tw test_gdb test_ossaudiodev
     test_sunaudiodev
-357 tests OK.
-4 tests failed:
-    test_ctypes test_doctest test_multiprocessing test_re
+358 tests OK.
+3 tests failed:
+    test_ctypes test_multiprocessing test_re
 39 tests skipped:
     test_aepack test_al test_applesingle test_bsddb test_bsddb185
     test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk
diff -r 7dda4f1294c8 -r 397b904fa22e components/python/python27/test/results-64.master
--- a/components/python/python27/test/results-64.master	Wed Mar 04 08:51:31 2015 -0800
+++ b/components/python/python27/test/results-64.master	Wed Mar 04 10:42:54 2015 -0800
@@ -1,6 +1,6 @@
-355 tests OK.
-4 tests failed:
-    test_ctypes test_distutils test_doctest test_re
+356 tests OK.
+3 tests failed:
+    test_ctypes test_distutils test_re
 41 tests skipped:
     test_aepack test_al test_applesingle test_bsddb test_bsddb185
     test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk
@@ -16,9 +16,9 @@
     test_bsddb3 test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp
     test_codecmaps_kr test_codecmaps_tw test_dl test_gdb
     test_ossaudiodev test_sunaudiodev
-355 tests OK.
-4 tests failed:
-    test_ctypes test_distutils test_doctest test_re
+356 tests OK.
+3 tests failed:
+    test_ctypes test_distutils test_re
 41 tests skipped:
     test_aepack test_al test_applesingle test_bsddb test_bsddb185
     test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk
diff -r 7dda4f1294c8 -r 397b904fa22e components/python/python34/patches/23-doctest.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python34/patches/23-doctest.patch	Wed Mar 04 10:42:54 2015 -0800
@@ -0,0 +1,23 @@
+This patch was developed in-house and has been submitted upstream:
+http://bugs.python.org/issue23584
+
+--- Python-3.4.3/Lib/test/test_doctest.py.~1~	2015-02-25 09:03:45.000000000 -0800
++++ Python-3.4.3/Lib/test/test_doctest.py	2015-03-04 08:26:35.762756585 -0800
+@@ -2627,7 +2627,7 @@
+     >>> with open(fn, 'w') as f:
+     ...    f.write('Test:\r\n\r\n  >>> x = 1 + 1\r\n\r\nDone.\r\n')
+     35
+-    >>> doctest.testfile(fn, False)
++    >>> doctest.testfile(fn, False, verbose=False)
+     TestResults(failed=0, attempted=1)
+     >>> os.remove(fn)
+ 
+@@ -2637,7 +2637,7 @@
+     >>> with open(fn, 'w') as f:
+     ...     f.write('Test:\n\n  >>> x = 1 + 1\n\nDone.\n')
+     30
+-    >>> doctest.testfile(fn, False)
++    >>> doctest.testfile(fn, False, verbose=False)
+     TestResults(failed=0, attempted=1)
+     >>> os.remove(fn)
+