Fixed #8235: use subprocess instead of popen3 so that Python 2.6 is happy. Thanks, Karen Tracey.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1613903906
commit
efaa891b1f
|
@ -106,7 +106,12 @@ class AdminScriptTestCase(unittest.TestCase):
|
|||
|
||||
# Move to the test directory and run
|
||||
os.chdir(test_dir)
|
||||
stdin, stdout, stderr = os.popen3(cmd)
|
||||
try:
|
||||
from subprocess import Popen, PIPE
|
||||
p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE)
|
||||
stdin, stdout, stderr = (p.stdin, p.stdout, p.stderr)
|
||||
except ImportError:
|
||||
stdin, stdout, stderr = os.popen3(cmd)
|
||||
out, err = stdout.read(), stderr.read()
|
||||
|
||||
# Restore the old environment
|
||||
|
|
Loading…
Reference in New Issue