[Python-checkins] cpython (merge 3.6 -> default): Issue #28338: Merge from 3.6.

[xavier.degaye]

https://hg.python.org/cpython/rev/d23ac799fe83
changeset:   104244:d23ac799fe83
parent:      104242:3da460ca854b
parent:      104243:7fe1f23ec60a
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Sun Oct 02 11:43:25 2016 +0200
summary:
  Issue #28338: Merge from 3.6.

files:
  Lib/test/test_pdb.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1093,7 +1093,7 @@
 
 def load_tests(*args):
     from test import test_pdb
-    suites = [unittest.makeSuite(PdbTestCase)]
+    suites = [unittest.makeSuite(PdbTestCase), doctest.DocTestSuite(test_pdb)]
     return unittest.TestSuite(suites)
 
 

-- 
Repository URL: https://hg.python.org/cpython