diff options
-rw-r--r-- | Lib/doctest.py | 5 | ||||
-rw-r--r-- | Lib/test/test_doctest.py | 29 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 37 insertions, 0 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index 5111a73..0db75b4 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1379,12 +1379,17 @@ class DocTestRunner: self.save_linecache_getlines = linecache.getlines linecache.getlines = self.__patched_linecache_getlines + # Make sure sys.displayhook just prints the value to stdout + save_displayhook = sys.displayhook + sys.displayhook = sys.__displayhook__ + try: return self.__run(test, compileflags, out) finally: sys.stdout = save_stdout pdb.set_trace = save_set_trace linecache.getlines = self.save_linecache_getlines + sys.displayhook = save_displayhook if clear_globs: test.globs.clear() import builtins diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 873e495..b6eeaed 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -980,6 +980,35 @@ unexpected exception: ZeroDivisionError: integer division or modulo by zero TestResults(failed=1, attempted=1) """ + def displayhook(): r""" +Test that changing sys.displayhook doesn't matter for doctest. + + >>> import sys + >>> orig_displayhook = sys.displayhook + >>> def my_displayhook(x): + ... print('hi!') + >>> sys.displayhook = my_displayhook + >>> def f(): + ... ''' + ... >>> 3 + ... 3 + ... ''' + >>> test = doctest.DocTestFinder().find(f)[0] + >>> r = doctest.DocTestRunner(verbose=False).run(test) + >>> post_displayhook = sys.displayhook + + We need to restore sys.displayhook now, so that we'll be able to test + results. + + >>> sys.displayhook = orig_displayhook + + Ok, now we can check that everything is ok. + + >>> r + TestResults(failed=0, attempted=1) + >>> post_displayhook is my_displayhook + True +""" def optionflags(): r""" Tests of `DocTestRunner`'s option flag handling. @@ -475,6 +475,9 @@ C-API Library ------- +- Issue #8048: Prevent doctests from failing when sys.displayhook has + been reassigned. + - Issue #8015: In pdb, do not crash when an empty line is entered as a breakpoint command. |