diff --git a/RESTful service/project.py b/RESTful service/project.py index 80da978..34b5274 100644 --- a/RESTful service/project.py +++ b/RESTful service/project.py @@ -3,7 +3,6 @@ import base64 import hmac import hashlib -import urllib import time import requests import json @@ -12,7 +11,7 @@ 'host': 'api.acrcloud.com', 'signature_version': '1', 'access_key': '', - 'access_secret': '', + 'access_secret': b'', }; @@ -28,9 +27,9 @@ def create_project(name, region, type, buckets, audio_type, external_id): string_to_sign = '\n'.join((http_method, uri, option['access_key'], option['signature_version'], str(timestamp))) - signature = sign(string_to_sign, option['access_secret']) + signature = sign(string_to_sign.encode(), option['access_secret']) - headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp} + headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)} data = {'name':name, 'region':region, 'type':type, 'buckets':json.dumps(buckets), 'audio_type':audio_type, 'external_id':external_id} @@ -47,9 +46,9 @@ def update_project(name, buckets): string_to_sign = '\n'.join((http_method, uri, option['access_key'], option['signature_version'], str(timestamp))) - signature = sign(string_to_sign, option['access_secret']) + signature = sign(string_to_sign.encode(), option['access_secret']) - headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp} + headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)} data = {'buckets':json.dumps(buckets)} @@ -65,9 +64,9 @@ def delete_project(name): string_to_sign = '\n'.join((http_method, uri, option['access_key'], option['signature_version'], str(timestamp))) - signature = sign(string_to_sign, option['access_secret']) + signature = sign(string_to_sign.encode(), option['access_secret']) - headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp} + headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)} data = {'name':name} @@ -82,8 +81,8 @@ def get_project(project_name): http_uri = "/v1/projects/"+project_name string_to_sign = '\n'.join((http_method, http_uri, option['access_key'], option['signature_version'], str(timestamp))) - signature = sign(string_to_sign, option['access_secret']) - headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp} + signature = sign(string_to_sign.encode(), option['access_secret']) + headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)} requrl = "https://"+option['host'] + http_uri r = requests.get(requrl, headers=headers, verify=True) @@ -96,8 +95,8 @@ def list_projects(): http_uri = "/v1/projects" string_to_sign = '\n'.join((http_method, http_uri, option['access_key'], option['signature_version'], str(timestamp))) - signature = sign(string_to_sign, option['access_secret']) - headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':timestamp} + signature = sign(string_to_sign.encode(), option['access_secret']) + headers = {'access-key': option['access_key'], 'signature-version': option['signature_version'], 'signature': signature, 'timestamp':str(timestamp)} requrl = "https://"+option['host'] + http_uri r = requests.get(requrl, headers=headers, verify=True)