Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed Python 2.3 compatibility code from the admin_scripts tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit cac7818e5ee83db486c170cb0002eb3f41d4fa84 1 parent a62ce30
Aymeric Augustin aaugustin authored
Showing with 4 additions and 16 deletions.
  1. +4 −16 tests/regressiontests/admin_scripts/tests.py
20 tests/regressiontests/admin_scripts/tests.py
View
@@ -9,6 +9,7 @@
import re
import shutil
import socket
+import subprocess
import sys
import urllib
@@ -111,27 +112,14 @@ def run_test(self, script, args, settings_file=None, apps=None):
python_path.extend(ext_backend_base_dirs)
os.environ[python_path_var_name] = os.pathsep.join(python_path)
- # Build the command line
- executable = sys.executable
- arg_string = ' '.join(['%s' % arg for arg in args])
# Silence the DeprecationWarning caused by having a locale directory
# in the project directory.
- if ' ' in executable:
- cmd = '""%s" -Wignore:::django.utils.translation "%s" %s"' % (executable, script, arg_string)
- else:
- cmd = '%s -Wignore:::django.utils.translation "%s" %s' % (executable, script, arg_string)
+ cmd = [sys.executable, '-Wignore:::django.utils.translation', script]
# Move to the test directory and run
os.chdir(test_dir)
- try:
- from subprocess import Popen, PIPE
- except ImportError:
- stdin, stdout, stderr = os.popen3(cmd)
- else:
- p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
- stdin, stdout, stderr = (p.stdin, p.stdout, p.stderr)
- p.wait()
- out, err = stdout.read(), stderr.read()
+ out, err = subprocess.Popen(cmd + args,
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
# Restore the old environment
if old_django_settings_module:
Please sign in to comment.
Something went wrong with that request. Please try again.