diff options
| author |   krishnaa96 <krishna.moorthy6@wipro.com> | 2020-02-27 17:25:37 +0530 |
|---|---|---|
| committer | krishnaa96 <krishna.moorthy6@wipro.com> | 2020-02-27 22:48:47 +0530 |
| commit | 93ae0cde9d5f0e9858317922dec4f15b2767bb49 (patch) | |
| tree | 701dc7ec868970b237c1e7040d6af3a474542336 | |
| parent | 3d0f4862a69478e564756a76a953d68325b9d83d (diff) | |
Change requirement versions for python 3.8
Add byte to string conversion after base64 encode
Issue-ID: OPTFRA-645
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>
Change-Id: I27326dd35b6727da80c159cb34d5d67e0829cf8f
| -rw-r--r-- | conductor/conductor/common/utils/basic_auth_util.py | 3 | ||||
| -rw-r--r-- | conductor/requirements.txt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/conductor/conductor/common/utils/basic_auth_util.py b/conductor/conductor/common/utils/basic_auth_util.py index 039384f..def8b0a 100644 --- a/conductor/conductor/common/utils/basic_auth_util.py +++ b/conductor/conductor/common/utils/basic_auth_util.py @@ -33,7 +33,6 @@ def encode(user_id, password): # like object so we need to convert the str into bytes user_pass = user_pass.encode() # converting str into bytes form - base64_val = base64.b64encode(user_pass) + base64_val = base64.b64encode(user_pass).decode() authorization_val = _LE("Basic {}".format(base64_val)) - return authorization_val diff --git a/conductor/requirements.txt b/conductor/requirements.txt index 6ad13e2..42a0d89 100644 --- a/conductor/requirements.txt +++ b/conductor/requirements.txt @@ -4,7 +4,7 @@ cotyledon # Apache-2.0 futurist>=0.11.0 # Apache-2.0 -lxml>=2.3 # BSD +lxml>=4.5.0 # BSD oslo.config>=3.9.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 @@ -26,4 +26,4 @@ WebOb>=1.2.3 # MIT onapsmsclient>=0.0.4 Flask>=0.11.1 prometheus-client>=0.3.1 -pycrypto==2.6.1 +pycryptodome==3.9.7 |