Skip to content

Commit ee97468

Browse files
author
ccharlesren
committed
资源管理:修改put请求库
Change-Id: I7eb944e56483193d81c3cc7fbe5ca8571f380038
1 parent 7f5c88f commit ee97468

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

hub/hub.py

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
from hub.services.ota.ota import Ota
3939
from hub.services.resourceManage.resourceManage import ResourceManage
4040
import os
41-
import requests
4241

4342
class SingletonType(type):
4443
_instance_lock = threading.Lock()
@@ -1592,12 +1591,24 @@ def resourceUploadfile(self, uploadTaskUrl, timeout=10):
15921591
request_text = fileConent
15931592
data = bytes(request_text, encoding='utf-8')
15941593

1595-
r = requests.put(uploadTaskUrl, data=data, headers=header)
1596-
if r.status_code == 200:
1597-
return 0, 0
1598-
else:
1599-
self._logger.error("put request fail status code:%s reason:%s",r.status_code,r.reason)
1600-
return -1, -1
1594+
context = None
1595+
if self.__tls:
1596+
context = self.__codec.Ssl().create_content()
1597+
1598+
req = urllib.request.Request(uploadTaskUrl, data=data, headers=header, method='PUT')
1599+
with urllib.request.urlopen(req, timeout=timeout, context=context) as url_file:
1600+
if url_file.status == 200 and url_file.reason == 'ok':
1601+
return 0, 0
1602+
else:
1603+
self._logger.error("put request fail status code:%s reason:%s",url_file.status,url_file.reason)
1604+
return -1, -1
1605+
1606+
# r = requests.put(uploadTaskUrl, data=data, headers=header)
1607+
# if r.status_code == 200:
1608+
# return 0, 0
1609+
# else:
1610+
# self._logger.error("put request fail status code:%s reason:%s",r.status_code,r.reason)
1611+
# return -1, -1
16011612

16021613
def resourceFinished(self):
16031614

0 commit comments

Comments
 (0)