mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #32821 -- Updated os.scandir() uses to use a context manager.

Browse Source
This commit is contained in:
Chris Jerdonek
2021-06-05 23:56:34 -07:00
committed by Mariusz Felisiak
parent 7dd502b0e1
commit 7272e1963f
6 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/runtests.py
View File

@@ -127,18 +127,19 @@ def get_test_modules():
for dirname in discovery_dirs:
dirpath = os.path.join(RUNTESTS_DIR, dirname)
subdirs_to_skip = SUBDIRS_TO_SKIP[dirname]
for f in os.scandir(dirpath):
if (
'.' in f.name or
os.path.basename(f.name) in subdirs_to_skip or
f.is_file() or
not os.path.exists(os.path.join(f.path, '__init__.py'))
):
continue
test_module = f.name
if dirname:
test_module = dirname + '.' + test_module
yield test_module
with os.scandir(dirpath) as entries:
for f in entries:
if (
'.' in f.name or
os.path.basename(f.name) in subdirs_to_skip or
f.is_file() or
not os.path.exists(os.path.join(f.path, '__init__.py'))
):
continue
test_module = f.name
if dirname:
test_module = dirname + '.' + test_module
yield test_module
def get_installed():