From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 24 Jun 2016 06:29:21 +0000 (+0300)
Subject: Issue #18300: Merge from 3.5
X-Git-Tag: v3.6.0a3~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a67d78e50c02ea3a5605d2e8103342b314bfece7;p=thirdparty%2FPython%2Fcpython.git

Issue #18300: Merge from 3.5
---

a67d78e50c02ea3a5605d2e8103342b314bfece7
diff --cc Lib/test/test_doctest.py
index ec12fe7372e0,33163b938791..b416cbb0aaff
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@@ -2803,18 -2798,19 +2797,18 @@@ text files)
      ...         _ = f.write("       'abc def'\n")
      ...         _ = f.write("\n")
      ...         _ = f.write('   \"\"\"\n')
 -    ...     import shutil
      ...     rc1, out1, err1 = script_helper.assert_python_failure(
-     ...             '-m', 'doctest', fn, fn2, TERM='')
+     ...             '-m', 'doctest', fn, fn2)
      ...     rc2, out2, err2 = script_helper.assert_python_ok(
-     ...             '-m', 'doctest', '-o', 'ELLIPSIS', fn, TERM='')
+     ...             '-m', 'doctest', '-o', 'ELLIPSIS', fn)
      ...     rc3, out3, err3 = script_helper.assert_python_ok(
      ...             '-m', 'doctest', '-o', 'ELLIPSIS',
-     ...             '-o', 'NORMALIZE_WHITESPACE', fn, fn2, TERM='')
+     ...             '-o', 'NORMALIZE_WHITESPACE', fn, fn2)
      ...     rc4, out4, err4 = script_helper.assert_python_failure(
-     ...             '-m', 'doctest', '-f', fn, fn2, TERM='')
+     ...             '-m', 'doctest', '-f', fn, fn2)
      ...     rc5, out5, err5 = script_helper.assert_python_ok(
      ...             '-m', 'doctest', '-v', '-o', 'ELLIPSIS',
-     ...             '-o', 'NORMALIZE_WHITESPACE', fn, fn2, TERM='')
+     ...             '-o', 'NORMALIZE_WHITESPACE', fn, fn2)
  
  Our first test run will show the errors from the first file (doctest stops if a
  file has errors).  Note that doctest test-run error output appears on stdout,