openstack/python-keystoneclient
Code Issues Proposed changes

Use textwrap instead of home made implementation

Browse Source 
This change replaces a home made text wrapper by textwrap module. It is
a non-functional change which is covered by existing tests.

Closes-Bug: #1404402
Change-Id: I5cc4da61205f64b478366c29e6d7ff9929ad4d16
This commit is contained in:
Cedric Brandily
2014-12-04 13:06:08 +01:00
parent f8f81bb119
commit 4350c17604
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
keystoneclient/common/cms.py
View File

@@ -23,6 +23,7 @@ import base64
import errno import errno
import hashlib import hashlib
import logging import logging
import textwrap
import zlib import zlib
import six import six
@@ -227,20 +228,10 @@ def pkiz_verify(signed_text, signing_cert_file_name, ca_file_name):
def token_to_cms(signed_text): def token_to_cms(signed_text):
copy_of_text = signed_text.replace('-', '/') copy_of_text = signed_text.replace('-', '/')
formatted = '-----BEGIN CMS-----\n' lines = ['-----BEGIN CMS-----']
line_length = 64 lines += textwrap.wrap(copy_of_text, 64)
while len(copy_of_text) > 0: lines.append('-----END CMS-----\n')
if (len(copy_of_text) > line_length): return '\n'.join(lines)
formatted += copy_of_text[:line_length]
copy_of_text = copy_of_text[line_length:]
else:
formatted += copy_of_text
copy_of_text = ''
formatted += '\n'
formatted += '-----END CMS-----\n'
return formatted
def verify_token(token, signing_cert_file_name, ca_file_name): def verify_token(token, signing_cert_file_name, ca_file_name):