Skip to content

Commit

Permalink
bpo-37473: Don't import importlib ASAP in tests (pythonGH-14661)
Browse files Browse the repository at this point in the history
bpo-15386, bpo-37473: test_import, regrtest and libregrtest no longer
import importlib as soon as possible, as the first import, "to test
bpo-15386".

It is tested by test_import.test_there_can_be_only_one().

Sort test_import imports.
  • Loading branch information
vstinner authored Jul 14, 2019
1 parent 1c5e68e commit 8b7db5a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
3 changes: 0 additions & 3 deletions Lib/test/libregrtest/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
# We import importlib *ASAP* in order to test #15386
import importlib

from test.libregrtest.cmdline import _parse_args, RESOURCE_NAMES, ALL_RESOURCES
from test.libregrtest.main import main
3 changes: 0 additions & 3 deletions Lib/test/regrtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
Run this script with -h or --help for documentation.
"""

# We import importlib *ASAP* in order to test #15386
import importlib

import os
import sys
from test.libregrtest import main
Expand Down
16 changes: 7 additions & 9 deletions Lib/test/test_import/__init__.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
# We import importlib *ASAP* in order to test #15386
import importlib
import builtins
import contextlib
import errno
import glob
import importlib.util
from importlib._bootstrap_external import _get_sourcefile
import builtins
import marshal
import os
import py_compile
import random
import shutil
import subprocess
import stat
import subprocess
import sys
import textwrap
import threading
import time
import unittest
import unittest.mock as mock
import textwrap
import errno
import contextlib
import glob
from unittest import mock

import test.support
from test.support import (
Expand Down

0 comments on commit 8b7db5a

Please sign in to comment.