openstack/python-keystoneclient
Code Issues Proposed changes

Merge "cms: Use universal_newlines=True in subprocess.Popen()"

Browse Source
This commit is contained in:
Jenkins
2014-02-10 02:25:11 +00:00
committed by Gerrit Code Review
parent b9632bcc82 1ee161e162
commit b34bb1b02b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keystoneclient/common/cms.py
View File

@@ -114,7 +114,8 @@ def cms_verify(formatted, signing_cert_file_name, ca_file_name):
"-nocerts", "-noattr"], "-nocerts", "-noattr"],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
output, err, retcode = _process_communicate_handle_oserror( output, err, retcode = _process_communicate_handle_oserror(
process, formatted, (signing_cert_file_name, ca_file_name)) process, formatted, (signing_cert_file_name, ca_file_name))
@@ -225,7 +226,8 @@ def cms_sign_text(text, signing_cert_file_name, signing_key_file_name):
"-nocerts", "-noattr"], "-nocerts", "-noattr"],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE,
universal_newlines=True)
output, err, retcode = _process_communicate_handle_oserror( output, err, retcode = _process_communicate_handle_oserror(
process, text, (signing_cert_file_name, signing_key_file_name)) process, text, (signing_cert_file_name, signing_key_file_name))