summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-09-16 18:46:35 +0000
committerGerrit Code Review <review@openstack.org>2022-09-16 18:46:35 +0000
commit9344c19fd44be944396436e22b0e1f2b98bcc0b5 (patch)
tree68b724d96e4751084e3b780fbe8abf939b861f9e
parent79b7fa1ce1e4cb522651a249e3af320bd8d15974 (diff)
parent10c96c29780e4653de4f51f467b427be1b07322a (diff)
downloadcinder-9344c19fd44be944396436e22b0e1f2b98bcc0b5.tar.gz
Merge "Replace base64.encodestring with encodebytes"
-rw-r--r--cinder/volume/drivers/prophetstor/dplcommon.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cinder/volume/drivers/prophetstor/dplcommon.py b/cinder/volume/drivers/prophetstor/dplcommon.py
index 2cde1c513..4f0713e6e 100644
--- a/cinder/volume/drivers/prophetstor/dplcommon.py
+++ b/cinder/volume/drivers/prophetstor/dplcommon.py
@@ -86,8 +86,8 @@ class DPLCommand(object):
'Accept': 'application/cdmi-container',
'x-cdmi-specification-version': '1.0.2'}
# base64 encode the username and password
- auth = base64.encodestring('%s:%s'
- % (self.username,
+ auth = base64.encodebytes('%s:%s'
+ % (self.username,
self.password)).replace('\n', '')
header['Authorization'] = 'Basic %s' % auth