diff options
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/autoreload.py | 6 | ||||
| -rw-r--r-- | django/utils/version.py | 4 |
2 files changed, 5 insertions, 5 deletions
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: |