resolve python2->python3 issues 90/91490/2
authormaopengzhang <zhang.maopeng1@zte.com.cn>
Tue, 16 Jul 2019 07:00:10 +0000 (15:00 +0800)
committermaopeng zhang <zhang.maopeng1@zte.com.cn>
Tue, 16 Jul 2019 07:02:14 +0000 (07:02 +0000)
change base64 code

Change-Id: I092efe7d586297a6389150b72c2f80fced1f7a2f
Issue-ID: VFC-1429
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
lcm/pub/utils/restcall.py

index 3cc6ed4..d59513e 100644 (file)
@@ -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)