summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authormaopengzhang <zhang.maopeng1@zte.com.cn>2019-07-16 16:40:29 +0800
committermaopengzhang <zhang.maopeng1@zte.com.cn>2019-07-16 16:40:29 +0800
commitb4aa6c19fdb3937fd91ca26da3d0e8c7f33c25f6 (patch)
treed83f8d4dbc207791082cacf9bdcf52b729d9ee9c /lcm
parent89b6e7c193199259cda3f01b46082cc4e8cc9ffd (diff)
resolve python2->python3 issues
change base64 code Change-Id: I063c4f256799c58e31e13e134d306359e8fd9d60 Issue-ID: VFC-1429 Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/pub/utils/restcall.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lcm/lcm/pub/utils/restcall.py b/lcm/lcm/pub/utils/restcall.py
index 37ff668a..08c33c55 100644
--- a/lcm/lcm/pub/utils/restcall.py
+++ b/lcm/lcm/pub/utils/restcall.py
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import base64
import sys
import traceback
import logging
@@ -39,7 +40,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad
full_url = combine_url(base_url, resource)
headers = {'content-type': 'application/json', 'accept': 'application/json'}
if user:
- headers['Authorization'] = 'Basic ' + ('%s:%s' % (user, passwd)).encode("base64")
+ headers['Authorization'] = 'Basic %s' % base64.b64encode(bytes('%s:%s' % (user, passwd), "utf-8")).decode()
ca_certs = None
if additional_headers:
headers.update(additional_headers)