From 40ba9381473dc3afd7391947e4f1fc4cf24aff10 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 22 Jun 2022 18:37:52 +0200 Subject: [PATCH] gh-84623: Move imports in doctests Move imports in doctests to prevent false alarms in pyflakes. --- Lib/test/test_descrtut.py | 2 +- Lib/test/test_doctest.py | 6 +++--- Lib/test/test_extcall.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index e01a31a74695d5..b4158eb23a56f0 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -9,7 +9,6 @@ # deterministic. from test.support import sortdict -import pprint import doctest import unittest @@ -167,6 +166,7 @@ def merge(self, other): You can get the information from the list type: + >>> import pprint >>> pprint.pprint(dir(list)) # like list.__dict__.keys(), but sorted ['__add__', '__class__', diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index a4aab6cf4db3b5..7c799697d9c225 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -4,7 +4,6 @@ from test import support from test.support import import_helper -from test.support import os_helper import doctest import functools import os @@ -14,7 +13,6 @@ import importlib.util import unittest import tempfile -import shutil import types import contextlib @@ -461,7 +459,7 @@ def basics(): r""" >>> tests = finder.find(sample_func) >>> print(tests) # doctest: +ELLIPSIS - [] + [] The exact name depends on how test_doctest was invoked, so allow for leading path components. @@ -2811,6 +2809,8 @@ def test_lineendings(): r""" at least one of the line endings will raise a ValueError for inconsistent whitespace if doctest does not correctly do the newline conversion. + >>> from test.support import os_helper + >>> import shutil >>> dn = tempfile.mkdtemp() >>> pkg = os.path.join(dn, "doctest_testpkg") >>> os.mkdir(pkg) diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py index 13265ea0d8ce85..11d39ec63a49e3 100644 --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -8,6 +8,7 @@ We're defining four helper functions + >>> from test import support >>> def e(a,b): ... print(a, b) @@ -522,7 +523,6 @@ import doctest import unittest -from test import support def load_tests(loader, tests, pattern): tests.addTest(doctest.DocTestSuite())