summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--django/contrib/admin/bin/compress.py2
-rw-r--r--django/core/management/utils.py9
-rw-r--r--django/db/backends/mysql/client.py2
-rw-r--r--django/db/backends/oracle/client.py2
-rw-r--r--django/db/backends/sqlite3/client.py2
-rw-r--r--django/utils/autoreload.py6
-rw-r--r--django/utils/version.py4
-rw-r--r--scripts/manage_translations.py26
-rw-r--r--tests/admin_scripts/tests.py5
-rw-r--r--tests/dbshell/test_oracle.py9
-rw-r--r--tests/i18n/test_compilation.py4
-rwxr-xr-xtests/runtests.py10
-rw-r--r--tests/utils_tests/test_autoreload.py3
13 files changed, 42 insertions, 42 deletions
diff --git a/django/contrib/admin/bin/compress.py b/django/contrib/admin/bin/compress.py
index d8d840f2b2..1cadc71ed7 100644
--- a/django/contrib/admin/bin/compress.py
+++ b/django/contrib/admin/bin/compress.py
@@ -54,7 +54,7 @@ Compiler library and Java version 6 or later."""
)
if options.verbose:
sys.stdout.write("Running: %s\n" % cmd)
- subprocess.call(cmd.split())
+ subprocess.run(cmd.split())
else:
sys.stdout.write("File %s not found. Sure it exists?\n" % to_compress)
diff --git a/django/core/management/utils.py b/django/core/management/utils.py
index c201684c9c..43addf8bdd 100644
--- a/django/core/management/utils.py
+++ b/django/core/management/utils.py
@@ -1,7 +1,7 @@
import fnmatch
import os
from pathlib import Path
-from subprocess import PIPE, Popen
+from subprocess import PIPE, run
from django.apps import apps as installed_apps
from django.utils.crypto import get_random_string
@@ -17,13 +17,12 @@ def popen_wrapper(args, stdout_encoding='utf-8'):
Return stdout output, stderr output, and OS status code.
"""
try:
- p = Popen(args, shell=False, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt')
+ p = run(args, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt')
except OSError as err:
raise CommandError('Error executing %s' % args[0]) from err
- output, errors = p.communicate()
return (
- output.decode(stdout_encoding),
- errors.decode(DEFAULT_LOCALE_ENCODING, errors='replace'),
+ p.stdout.decode(stdout_encoding),
+ p.stderr.decode(DEFAULT_LOCALE_ENCODING, errors='replace'),
p.returncode
)
diff --git a/django/db/backends/mysql/client.py b/django/db/backends/mysql/client.py
index 224bfc3dc6..a596a650b3 100644
--- a/django/db/backends/mysql/client.py
+++ b/django/db/backends/mysql/client.py
@@ -45,4 +45,4 @@ class DatabaseClient(BaseDatabaseClient):
def runshell(self):
args = DatabaseClient.settings_to_cmd_args(self.connection.settings_dict)
- subprocess.check_call(args)
+ subprocess.run(args, check=True)
diff --git a/django/db/backends/oracle/client.py b/django/db/backends/oracle/client.py
index 4c5070a207..243c018d03 100644
--- a/django/db/backends/oracle/client.py
+++ b/django/db/backends/oracle/client.py
@@ -14,4 +14,4 @@ class DatabaseClient(BaseDatabaseClient):
wrapper_path = shutil.which(self.wrapper_name)
if wrapper_path:
args = [wrapper_path, *args]
- subprocess.check_call(args)
+ subprocess.run(args, check=True)
diff --git a/django/db/backends/sqlite3/client.py b/django/db/backends/sqlite3/client.py
index 0c490ea587..485d540188 100644
--- a/django/db/backends/sqlite3/client.py
+++ b/django/db/backends/sqlite3/client.py
@@ -9,4 +9,4 @@ class DatabaseClient(BaseDatabaseClient):
def runshell(self):
args = [self.executable_name,
self.connection.settings_dict['NAME']]
- subprocess.check_call(args)
+ subprocess.run(args, check=True)
diff --git a/django/utils/autoreload.py b/django/utils/autoreload.py
index f6215d4edf..d5445e5f3f 100644
--- a/django/utils/autoreload.py
+++ b/django/utils/autoreload.py
@@ -227,9 +227,9 @@ def restart_with_reloader():
new_environ = {**os.environ, DJANGO_AUTORELOAD_ENV: 'true'}
args = get_child_arguments()
while True:
- exit_code = subprocess.call(args, env=new_environ, close_fds=False)
- if exit_code != 3:
- return exit_code
+ p = subprocess.run(args, env=new_environ, close_fds=False)
+ if p.returncode != 3:
+ return p.returncode
class BaseReloader:
diff --git a/django/utils/version.py b/django/utils/version.py
index 7d17da318f..a6f667d2b1 100644
--- a/django/utils/version.py
+++ b/django/utils/version.py
@@ -77,12 +77,12 @@ def get_git_changeset():
so it's sufficient for generating the development version numbers.
"""
repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
- git_log = subprocess.Popen(
+ git_log = subprocess.run(
'git log --pretty=format:%ct --quiet -1 HEAD',
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
shell=True, cwd=repo_dir, universal_newlines=True,
)
- timestamp = git_log.communicate()[0]
+ timestamp = git_log.stdout
try:
timestamp = datetime.datetime.utcfromtimestamp(int(timestamp))
except ValueError:
diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py
index 49f9f903db..1eb1635822 100644
--- a/scripts/manage_translations.py
+++ b/scripts/manage_translations.py
@@ -20,7 +20,7 @@
import os
from argparse import ArgumentParser
-from subprocess import PIPE, Popen, call
+from subprocess import PIPE, run
import django
from django.conf import settings
@@ -73,10 +73,9 @@ def _check_diff(cat_name, base_path):
"""
po_path = '%(path)s/en/LC_MESSAGES/django%(ext)s.po' % {
'path': base_path, 'ext': 'js' if cat_name.endswith('-js') else ''}
- p = Popen("git diff -U0 %s | egrep '^[-+]msgid' | wc -l" % po_path,
- stdout=PIPE, stderr=PIPE, shell=True)
- output, errors = p.communicate()
- num_changes = int(output.strip())
+ p = run("git diff -U0 %s | egrep '^[-+]msgid' | wc -l" % po_path,
+ stdout=PIPE, stderr=PIPE, shell=True)
+ num_changes = int(p.stdout.strip())
print("%d changed/added messages in '%s' catalog." % (num_changes, cat_name))
@@ -122,18 +121,17 @@ def lang_stats(resources=None, languages=None):
po_path = '{path}/{lang}/LC_MESSAGES/django{ext}.po'.format(
path=dir_, lang=lang, ext='js' if name.endswith('-js') else ''
)
- p = Popen(
+ p = run(
['msgfmt', '-vc', '-o', '/dev/null', po_path],
stdout=PIPE, stderr=PIPE,
env={'LANG': 'C'}
)
- output, errors = p.communicate()
if p.returncode == 0:
# msgfmt output stats on stderr
- print("%s: %s" % (lang, errors.decode().strip()))
+ print("%s: %s" % (lang, p.stderr.decode().strip()))
else:
print("Errors happened when checking %s translation for %s:\n%s" % (
- lang, name, errors.decode()))
+ lang, name, p.stderr.decode()))
def fetch(resources=None, languages=None):
@@ -146,11 +144,11 @@ def fetch(resources=None, languages=None):
for name, dir_ in locale_dirs:
# Transifex pull
if languages is None:
- call('tx pull -r %(res)s -a -f --minimum-perc=5' % {'res': _tx_resource_for_name(name)}, shell=True)
+ run('tx pull -r %(res)s -a -f --minimum-perc=5' % {'res': _tx_resource_for_name(name)}, shell=True)
target_langs = sorted(d for d in os.listdir(dir_) if not d.startswith('_') and d != 'en')
else:
for lang in languages:
- call('tx pull -r %(res)s -f -l %(lang)s' % {
+ run('tx pull -r %(res)s -f -l %(lang)s' % {
'res': _tx_resource_for_name(name), 'lang': lang}, shell=True)
target_langs = languages
@@ -162,9 +160,9 @@ def fetch(resources=None, languages=None):
print("No %(lang)s translation for resource %(name)s" % {
'lang': lang, 'name': name})
continue
- call('msgcat --no-location -o %s %s' % (po_path, po_path), shell=True)
- res = call('msgfmt -c -o %s.mo %s' % (po_path[:-3], po_path), shell=True)
- if res != 0:
+ run('msgcat --no-location -o %s %s' % (po_path, po_path), shell=True)
+ msgfmt = run('msgfmt -c -o %s.mo %s' % (po_path[:-3], po_path), shell=True)
+ if msgfmt.returncode != 0:
errors.append((name, lang))
if errors:
print("\nWARNING: Errors have occurred in following cases:")
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index d6ea84da7a..1e4477ed34 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -118,12 +118,13 @@ class AdminScriptTestCase(SimpleTestCase):
test_environ['PYTHONPATH'] = os.pathsep.join(python_path)
test_environ['PYTHONWARNINGS'] = ''
- return subprocess.Popen(
+ p = subprocess.run(
[sys.executable, script] + args,
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
cwd=self.test_dir,
env=test_environ, universal_newlines=True,
- ).communicate()
+ )
+ return p.stdout, p.stderr
def run_django_admin(self, args, settings_file=None):
script_dir = os.path.abspath(os.path.join(os.path.dirname(django.__file__), 'bin'))
diff --git a/tests/dbshell/test_oracle.py b/tests/dbshell/test_oracle.py
index d236a932ab..cfaf106d68 100644
--- a/tests/dbshell/test_oracle.py
+++ b/tests/dbshell/test_oracle.py
@@ -1,3 +1,4 @@
+from subprocess import CompletedProcess
from unittest import mock, skipUnless
from django.db import connection
@@ -9,13 +10,13 @@ from django.test import SimpleTestCase
class OracleDbshellTests(SimpleTestCase):
def _run_dbshell(self, rlwrap=False):
"""Run runshell command and capture its arguments."""
- def _mock_subprocess_call(*args):
- self.subprocess_args = tuple(*args)
- return 0
+ def _mock_subprocess_run(*args):
+ self.subprocess_args = list(*args)
+ return CompletedProcess(self.subprocess_args, 0)
client = DatabaseClient(connection)
self.subprocess_args = None
- with mock.patch('subprocess.call', new=_mock_subprocess_call):
+ with mock.patch('subprocess.run', new=_mock_subprocess_run):
with mock.patch('shutil.which', return_value='/usr/bin/rlwrap' if rlwrap else None):
client.runshell()
return self.subprocess_args
diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py
index aa457f21f6..91e0714cec 100644
--- a/tests/i18n/test_compilation.py
+++ b/tests/i18n/test_compilation.py
@@ -4,7 +4,7 @@ import stat
import unittest
from io import StringIO
from pathlib import Path
-from subprocess import Popen
+from subprocess import run
from unittest import mock
from django.core.management import (
@@ -184,7 +184,7 @@ class CompilationErrorHandling(MessageCompilationTests):
# Make sure the output of msgfmt is unaffected by the current locale.
env = os.environ.copy()
env.update({'LANG': 'C'})
- with mock.patch('django.core.management.utils.Popen', lambda *args, **kwargs: Popen(*args, env=env, **kwargs)):
+ with mock.patch('django.core.management.utils.run', lambda *args, **kwargs: run(*args, env=env, **kwargs)):
cmd = MakeMessagesCommand()
if cmd.gettext_version < (0, 18, 3):
self.skipTest("python-brace-format is a recent gettext addition.")
diff --git a/tests/runtests.py b/tests/runtests.py
index 840c06321d..be1760e693 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -355,22 +355,22 @@ def bisect_tests(bisection_label, options, test_labels, parallel, start_at, star
test_labels_b = test_labels[midpoint:] + [bisection_label]
print('***** Pass %da: Running the first half of the test suite' % iteration)
print('***** Test labels: %s' % ' '.join(test_labels_a))
- failures_a = subprocess.call(subprocess_args + test_labels_a)
+ failures_a = subprocess.run(subprocess_args + test_labels_a)
print('***** Pass %db: Running the second half of the test suite' % iteration)
print('***** Test labels: %s' % ' '.join(test_labels_b))
print('')
- failures_b = subprocess.call(subprocess_args + test_labels_b)
+ failures_b = subprocess.run(subprocess_args + test_labels_b)
- if failures_a and not failures_b:
+ if failures_a.returncode and not failures_b.returncode:
print("***** Problem found in first half. Bisecting again...")
iteration += 1
test_labels = test_labels_a[:-1]
- elif failures_b and not failures_a:
+ elif failures_b.returncode and not failures_a.returncode:
print("***** Problem found in second half. Bisecting again...")
iteration += 1
test_labels = test_labels_b[:-1]
- elif failures_a and failures_b:
+ elif failures_a.returncode and failures_b.returncode:
print("***** Multiple sources of failure found")
break
else:
diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py
index b673c5e1c0..2216d003ee 100644
--- a/tests/utils_tests/test_autoreload.py
+++ b/tests/utils_tests/test_autoreload.py
@@ -11,6 +11,7 @@ import weakref
import zipfile
from importlib import import_module
from pathlib import Path
+from subprocess import CompletedProcess
from unittest import mock, skip, skipIf
from django.apps.registry import Apps
@@ -345,7 +346,7 @@ class RestartWithReloaderTests(SimpleTestCase):
executable = '/usr/bin/python'
def patch_autoreload(self, argv):
- patch_call = mock.patch('django.utils.autoreload.subprocess.call', return_value=0)
+ patch_call = mock.patch('django.utils.autoreload.subprocess.run', return_value=CompletedProcess(argv, 0))
patches = [
mock.patch('django.utils.autoreload.sys.argv', argv),
mock.patch('django.utils.autoreload.sys.executable', self.executable),
generated by cgit v1.3 (git 2.53.0) at 2026-05-02 06:30:32 +0000