Skip to content

bpo-40275: test.supports imports lazily fnmatch, glob, struct #20810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jun 11, 2020
Merged

bpo-40275: test.supports imports lazily fnmatch, glob, struct #20810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@

import contextlib
import errno
import fnmatch
import functools
import glob
import os
import re
import stat
import struct
import sys
import sysconfig
import time
Expand Down Expand Up @@ -846,9 +843,11 @@ def python_is_optimized():
_vheader = _header + 'n'

def calcobjsize(fmt):
import struct
return struct.calcsize(_header + fmt + _align)

def calcvobjsize(fmt):
import struct
return struct.calcsize(_vheader + fmt + _align)


Expand Down Expand Up @@ -1255,6 +1254,7 @@ def _compile_match_function(patterns):
# The test.bisect_cmd utility only uses such full test identifiers.
func = set(patterns).__contains__
else:
import fnmatch
regex = '|'.join(map(fnmatch.translate, patterns))
# The search *is* case sensitive on purpose:
# don't use flags=re.IGNORECASE
Expand Down Expand Up @@ -1534,6 +1534,7 @@ def _platform_specific(self):

if sys.platform == "win32":
def _platform_specific(self):
import glob
import _winapi

if os.path.lexists(self.real) and not os.path.exists(self.real):
Expand Down