From e21d3e267140135cc7124a7cfce336e55a2d44b9 Mon Sep 17 00:00:00 2001 From: maopengzhang Date: Tue, 16 Jul 2019 15:00:10 +0800 Subject: [PATCH] resolve python2->python3 issues change base64 code Change-Id: I092efe7d586297a6389150b72c2f80fced1f7a2f Issue-ID: VFC-1429 Signed-off-by: maopengzhang --- lcm/pub/utils/restcall.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lcm/pub/utils/restcall.py b/lcm/pub/utils/restcall.py index 3cc6ed44..d59513ef 100644 --- a/lcm/pub/utils/restcall.py +++ b/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 @@ -43,7 +44,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")) ca_certs = None if additional_headers: headers.update(additional_headers) -- 2.16.6