summaryrefslogtreecommitdiff
path: root/keystoneclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-02-10 02:25:11 +0000
committerGerrit Code Review <review@openstack.org>2014-02-10 02:25:11 +0000
commitb34bb1b02bcbcc20691fa1d02c508b819e877ad9 (patch)
tree3222f6b2481223ef68febe638c6c81dc4016cffd /keystoneclient/common
parentb9632bcc82a17f7abbbcbf4517e3527cc2695db9 (diff)
parent1ee161e162ff9c50e18124eac47a434ff327f500 (diff)
downloadpython-keystoneclient-b34bb1b02bcbcc20691fa1d02c508b819e877ad9.tar.gz
Merge "cms: Use universal_newlines=True in subprocess.Popen()"
Diffstat (limited to 'keystoneclient/common')
-rw-r--r--keystoneclient/common/cms.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/keystoneclient/common/cms.py b/keystoneclient/common/cms.py
index 0083674..145ed60 100644
--- a/keystoneclient/common/cms.py
+++ b/keystoneclient/common/cms.py
@@ -114,7 +114,8 @@ def cms_verify(formatted, signing_cert_file_name, ca_file_name):
"-nocerts", "-noattr"],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
+ stderr=subprocess.PIPE,
+ universal_newlines=True)
output, err, retcode = _process_communicate_handle_oserror(
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"],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
+ stderr=subprocess.PIPE,
+ universal_newlines=True)
output, err, retcode = _process_communicate_handle_oserror(
process, text, (signing_cert_file_name, signing_key_file_name))