openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Directly using base64 encoding for injected files"

This commit is contained in:
Jenkins 2015-01-13 23:30:46 +00:00 committed by Gerrit Code Review
parent 141f2ab462 f75ea86a2a
commit 0f7bf49388
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/v1_1/servers.py
View File

@ -506,7 +506,9 @@ class ServerManager(base.BootingManagerWithFind):
else:
data = file_or_string
cont = base64.b64encode(data.encode('utf-8')).decode('utf-8')
if six.PY3 and isinstance(data, str):
data = data.encode('utf-8')
cont = base64.b64encode(data).decode('utf-8')
personality.append({
'path': filepath,
'contents': cont,