From b3aa00013dab1f1fce394f15cc03dd00fedb4098 Mon Sep 17 00:00:00 2001 From: tiedu Date: Thu, 16 Aug 2018 21:32:35 +0800 Subject: [PATCH 1/7] .travis.yml --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cb6774a..2e9d4119 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,8 @@ language: python python: - '2.6' - '2.7' -- '3.5' -- '3.6' install: - pip install requests -- pip install six - pip install nose - pip install pep8 - pip install dicttoxml @@ -18,7 +15,7 @@ deploy: provider: pypi distributions: sdist bdist_wheel user: dt3310321 - password: ********* + password: 000000000 on: tags: true branch: master From 3b84d29e363eb139e58815c15394073a03d7038b Mon Sep 17 00:00:00 2001 From: tiedu Date: Thu, 16 Aug 2018 21:34:15 +0800 Subject: [PATCH 2/7] fix tiny bugs --- qcloud_cos/cos_client.py | 6 ++++-- qcloud_cos/cos_comm.py | 1 + qcloud_cos/cos_exception.py | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 9743debb..5cd81de0 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -185,8 +185,10 @@ def send_request(self, method, url, timeout=30, **kwargs): info['code'] = 'NoSuchResource' info['message'] = 'The Resource You Head Not Exist' info['resource'] = url - info['requestid'] = res.headers['x-cos-request-id'] - info['traceid'] = res.headers['x-cos-trace-id'] + if 'x-cos-request-id' in res.headers: + info['requestid'] = res.headers['x-cos-request-id'] + if 'x-cos-trace-id' in res.headers: + info['traceid'] = res.headers['x-cos-trace-id'] logger.error(info) raise CosServiceError(method, info, res.status_code) else: diff --git a/qcloud_cos/cos_comm.py b/qcloud_cos/cos_comm.py index 93e8833c..d1d30a45 100644 --- a/qcloud_cos/cos_comm.py +++ b/qcloud_cos/cos_comm.py @@ -146,6 +146,7 @@ def xml_to_dict(data, origin_str="", replace_str=""): xmlstr = xmlstr.replace("{http://www.qcloud.com/document/product/436/7751}", "") xmlstr = xmlstr.replace("{https://cloud.tencent.com/document/product/436}", "") xmlstr = xmlstr.replace("{http://doc.s3.amazonaws.com/2006-03-01}", "") + xmlstr = xmlstr.replace("{http://s3.amazonaws.com/doc/2006-03-01/}", "") xmlstr = xmlstr.replace("{http://www.w3.org/2001/XMLSchema-instance}", "") if origin_str: xmlstr = xmlstr.replace(origin_str, replace_str) diff --git a/qcloud_cos/cos_exception.py b/qcloud_cos/cos_exception.py index bb8c2dea..c6f08411 100644 --- a/qcloud_cos/cos_exception.py +++ b/qcloud_cos/cos_exception.py @@ -27,7 +27,10 @@ def digest_xml(data): msg['requestid'] = result[0].childNodes[0].nodeValue result = root.getElementsByTagName('TraceId') - msg['traceid'] = result[0].childNodes[0].nodeValue + if result: + msg['traceid'] = result[0].childNodes[0].nodeValue + else: + msg['traceid'] = 'Unknown' return msg except Exception as e: return "Response Error Msg Is INVALID" From eb0cf4b1add8c6035cc8b65356e8339d2090906c Mon Sep 17 00:00:00 2001 From: tiedu Date: Thu, 16 Aug 2018 21:37:05 +0800 Subject: [PATCH 3/7] modify travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e9d4119..5518bb58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ language: python python: - '2.6' - '2.7' +- '3.5' +- '3.6' install: - pip install requests - pip install nose @@ -15,7 +17,7 @@ deploy: provider: pypi distributions: sdist bdist_wheel user: dt3310321 - password: 000000000 + password: 0 on: tags: true branch: master From 7c3adb579a11953fcdb0d9998a442716d228a943 Mon Sep 17 00:00:00 2001 From: tiedu Date: Mon, 20 Aug 2018 15:39:48 +0800 Subject: [PATCH 4/7] fix cos auth encode --- qcloud_cos/cos_auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcloud_cos/cos_auth.py b/qcloud_cos/cos_auth.py index 96f6eaa2..f5c75479 100644 --- a/qcloud_cos/cos_auth.py +++ b/qcloud_cos/cos_auth.py @@ -50,7 +50,7 @@ def __call__(self, r): format_str = u"{method}\n{host}\n{params}\n{headers}\n".format( method=r.method.lower(), host=path, - params=urlencode(sorted(uri_params.items())).replace('+', '%20'), + params=urlencode(sorted(uri_params.items())).replace('+', '%20').replace('%7E', '~'), headers='&'.join(map(lambda tupl: "%s=%s" % (tupl[0], tupl[1]), sorted(headers.items()))) ) logger.debug("format str: " + format_str) From 94eb3fb226db2f8ad2bfd174bebe5d49519f9726 Mon Sep 17 00:00:00 2001 From: tiedu Date: Fri, 31 Aug 2018 11:46:48 +0800 Subject: [PATCH 5/7] mpdify travis --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5518bb58..97777803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,11 @@ deploy: provider: pypi distributions: sdist bdist_wheel user: dt3310321 - password: 0 + password: + secure: LoSq2wZPbXJ4DkYCQk6Oi0mI6iwhAiE6Xgyvl+Rv1geYqPTuI8ht7dps2ENHM2gj8JqhsZ7C5p/g9P6YuIBk0OTYKewHgHBnUAQwePzu0N1ofzJtJVoSbhW0aPeNfF6DxkTPscBGCHuMyHb/r/buHa3hLoJKxF0l50jEUugTJnP6Ms7a3oa7GaLIJ4QAKMZtLTN31iIcW40r2vVwH+J3JyCr/xeUhwT5/MlaN9c5lLjh7eUig2DA8/6DpqPOm+wV+cn6dh2w2I294cSRsUPJJla63g0YTYbPT9RKeC2D5GiyfqCYAEYzvKdlBJ5hCURh5rxrjOCGlde4Inq0uX6AMETOnvJhkvDMQ5cZ2sUKUy4BC021xvVBdQ44MFI5oGAGUIHbhsAs6wKwWo2ZvmJ5A2Oh0Ny6cx+PzGkZVN9afDUeiGQQcXvHFPw/oZrtQo/H8y8YsIQedBbHOY4RUnt/ID2xOOaZ50REIaGPZJq4hXGgggRh14bKcFcAH/DkiMiBi0bMRhxUOUI57T+4F5Jl5AdrZg/j3FjVn4Jv3Xcr/+N6Xp2QIttRkpa3XpE7N3378V7PKMlGQs0YFWGqDKR9hffMgDQ6qC+E7/OylmxIrOHv4545QCfVUuOhkq9v6IINc1XkKZ4r0GpNk33yr08lZ+jlsMKZvycBF5W2Yp8LWkM= on: tags: true branch: master +env: + global: + secure: EZkLI0XwvSQD3Z4z62LBh5TojjwTlRRenN8p8KIvRnh40tSM5mZLV3N4tBFviPu4EcdVhlELgUrbk0y4kLePRnIIVCokcw1wWR1e1qWsa0bHO7vhlxA8yzmhUl8Zi+WiYmKJIKxadmSTS30ycRZqxtn8RC1geSIvUefxmyS4ei6X5gsQn6vT+KU5/ONSQZ0BU4PoDGss7s1lNGWRv6c1F3N3yemxtzA6Lf0ASqm/ZlTqx6IuSRxnrNW1m3V2JedW60iheOyXJIA719IUZuKmczOxqjBwDf7IxgkuEFCbSJMRAoH50KxPX5ZhlBfbiuUQtm2sdrLo5bHjeACGM1m/lZtT+DrjwC/q0iBnSL7IQPGWK54UdvnH6bycGkHovcU4HjJKxg0dK9jHhShv9GoBHrpvYVvr+KlSHCGldtNugGZR3TnWjsFY6vfbILV6Qy49CAHjjt27SVwx5tNZhauuUrlJAtMsZ5J7olusLtxOz5neAilwnb+PPpJMWjPyBAT/DqRrl9D8hQ4xuBL/vbX28EZO4zW9Z3uGnExlhQaAFTosbxkzCaqr0QatVJIlkDb70BB6UrAVY+6uEusTrleCHTEyzbhiKZgoKSJMNUUfZ3rwH2NqUn7DWgJt4CvrXG+P5HIouZOJ1IMtCtCGtS6vfwOHAhP8yXYXpbXY/ZQwXY0= From 867e6533b2bc25e87f372b3fd926d954ab66e17e Mon Sep 17 00:00:00 2001 From: tiedu Date: Fri, 31 Aug 2018 11:50:50 +0800 Subject: [PATCH 6/7] modify travis --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97777803..5881c633 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,3 @@ deploy: on: tags: true branch: master -env: - global: - secure: EZkLI0XwvSQD3Z4z62LBh5TojjwTlRRenN8p8KIvRnh40tSM5mZLV3N4tBFviPu4EcdVhlELgUrbk0y4kLePRnIIVCokcw1wWR1e1qWsa0bHO7vhlxA8yzmhUl8Zi+WiYmKJIKxadmSTS30ycRZqxtn8RC1geSIvUefxmyS4ei6X5gsQn6vT+KU5/ONSQZ0BU4PoDGss7s1lNGWRv6c1F3N3yemxtzA6Lf0ASqm/ZlTqx6IuSRxnrNW1m3V2JedW60iheOyXJIA719IUZuKmczOxqjBwDf7IxgkuEFCbSJMRAoH50KxPX5ZhlBfbiuUQtm2sdrLo5bHjeACGM1m/lZtT+DrjwC/q0iBnSL7IQPGWK54UdvnH6bycGkHovcU4HjJKxg0dK9jHhShv9GoBHrpvYVvr+KlSHCGldtNugGZR3TnWjsFY6vfbILV6Qy49CAHjjt27SVwx5tNZhauuUrlJAtMsZ5J7olusLtxOz5neAilwnb+PPpJMWjPyBAT/DqRrl9D8hQ4xuBL/vbX28EZO4zW9Z3uGnExlhQaAFTosbxkzCaqr0QatVJIlkDb70BB6UrAVY+6uEusTrleCHTEyzbhiKZgoKSJMNUUfZ3rwH2NqUn7DWgJt4CvrXG+P5HIouZOJ1IMtCtCGtS6vfwOHAhP8yXYXpbXY/ZQwXY0= From 8b37d5a9168e946e90719400426e4bcfe954ea3a Mon Sep 17 00:00:00 2001 From: tiedu Date: Fri, 31 Aug 2018 11:54:00 +0800 Subject: [PATCH 7/7] add six --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5881c633..663617fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ python: - '3.6' install: - pip install requests +- pip install six - pip install nose - pip install pep8 - pip install dicttoxml