handling conflicts

Author: yangjunren

CHANGELOG.md

@@ -1,38 +1,47 @@
 # Changelog
-# 7.2.8(2020-03-27)
+## 7.2.9 (2020-08-07)
+* 支持指定本地ctx缓存文件.qiniu_pythonsdk_hostscache.json 文件路径
+* 更正接口返回描述docstring
+* 修复接口对非json response 处理
+* ci 覆盖增加python 3.6 3.7
+* 修复获取域名列方法
+* 修复python3 环境下，二进制对象上传问题
+
+
+## 7.2.8(2020-03-27)
 * add restoreAr
 
-# 7.2.7(2020-03-10)
+## 7.2.7(2020-03-10)
 * fix bucket_info
 
-# 7.2.6(2019-06-26)
+## 7.2.6(2019-06-26)
 * 添加sms
 
-# 7.2.5 (2019-06-06)
+## 7.2.5 (2019-06-06)
 * 添加sms
 
-# 7.2.4 (2019-04-01)
+## 7.2.4 (2019-04-01)
 * 默认导入region类
 
-# 7.2.3 (2019-02-25)
+## 7.2.3 (2019-02-25)
 * 新增region类，zone继承
 * 上传可以指定上传域名
 * 新增上传指定上传空间和qvm指定上传内网的例子
 * 新增列举账号空间，创建空间，查询空间信息，改变文件状态接口，并提供例子
 
-# 7.2.2 (2018-05-10)
+## 7.2.2 (2018-05-10)
 * 增加连麦rtc服务端API功能
 
-# 7.2.0（2017-11-23）
+## 7.2.0（2017-11-23）
 * 修复put_data不支持file like object的问题
 * 增加空间写错时，抛出异常提示客户的功能
 * 增加创建空间的接口功能
 
-# 7.1.9（2017-11-01）
+## 7.1.9（2017-11-01）
 * 修复python2情况下，中文文件名上传失败的问题
 * 修复python2环境下，中文文件使用分片上传时失败的问题
 
-# 7.1.8 （2017-10-18）
+## 7.1.8 （2017-10-18）
 * 恢复kirk的API为原来的状态
 
 ## 7.1.7 (2017-09-27)

examples/get_domaininfo.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+"""
+获取指定域名指定时间内的日志链接
+"""
+import qiniu
+from qiniu import DomainManager
+
+
+# 账户ak，sk
+access_key = ''
+secret_key = ''
+
+auth = qiniu.Auth(access_key=access_key, secret_key=secret_key)
+domain_manager = DomainManager(auth)
+domain = ''
+ret, info = domain_manager.get_domain(domain)
+print(ret)
+print(info)

qiniu/__init__.py

@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.2.8'
+__version__ = '7.2.9'
 
 from .auth import Auth, QiniuMacAuth
 

qiniu/http.py

@@ -72,16 +72,20 @@ def _put(url, data, files, auth, headers=None):
     return __return_wrapper(r)
 
 
-def _get(url, params, auth):
+def _get(url, params, auth, headers=None):
     if _session is None:
         _init()
     try:
+        post_headers = _headers.copy()
+        if headers is not None:
+            for k, v in headers.items():
+                post_headers.update({k: v})
         r = _session.get(
             url,
             params=params,
-            auth=qiniu.auth.RequestsAuth(auth) if auth is not None else None,
+            auth=auth,
             timeout=config.get_default('connection_timeout'),
-            headers=_headers)
+            headers=post_headers)
     except Exception as e:
         return None, ResponseInfo(None, e)
     return __return_wrapper(r)
@@ -108,10 +112,18 @@ def _post_with_auth(url, data, auth):
     return _post(url, data, None, qiniu.auth.RequestsAuth(auth))
 
 
+def _get_with_auth(url, data, auth):
+    return _get(url, data,  qiniu.auth.RequestsAuth(auth))
+
+
 def _post_with_auth_and_headers(url, data, auth, headers):
     return _post(url, data, None, qiniu.auth.RequestsAuth(auth), headers)
 
 
+def _get_with_auth_and_headers(url, data, auth, headers):
+    return _get(url, data, qiniu.auth.RequestsAuth(auth), headers)
+
+
 def _post_with_qiniu_mac_and_headers(url, data, auth, headers):
     return _post(url, data, None, qiniu.auth.QiniuMacRequestsAuth(auth), headers)
 

qiniu/services/cdn/manager.py

@@ -212,7 +212,7 @@ def get_domain(self, name):
             - ResponseInfo    请求的Response信息
         """
         url = '{0}/domain/{1}'.format(self.server, name)
-        return self.__get(url, None)
+        return self.__get(url)
 
     def put_httpsconf(self, name, certid, forceHttps):
         """
@@ -268,8 +268,9 @@ def __put(self, url, data=None):
         headers = {'Content-Type': 'application/json'}
         return http._put_with_auth_and_headers(url, data, self.auth, headers)
 
-    def __get(self, url, params):
-        return http._get_with_qiniu_mac(url, params, self.auth)
+    def __get(self, url, data=None):
+        headers = {'Content-Type': 'application/json'}
+        return http._get_with_auth_and_headers(url, data, self.auth, headers)
 
 
 def create_timestamp_anti_leech_url(host, file_name, query_string, encrypt_key, deadline):

qiniu/services/storage/bucket.py

@@ -367,7 +367,7 @@ def __post(self, url, data=None):
         return http._post_with_auth(url, data, self.auth)
 
     def __get(self, url, params=None):
-        return http._get(url, params, self.auth)
+        return http._get_with_auth(url, params, self.auth)
 
 
 def _build_op(*args):

qiniu/services/storage/uploader.py

@@ -28,7 +28,7 @@ def put_data(
         一个dict变量，类似 {"hash": "<Hash string>", "key": "<Key string>"}
         一个ResponseInfo对象
     """
-    final_data = ''
+    final_data = b''
     if hasattr(data, 'read'):
         while True:
             tmp_data = data.read(config._BLOCK_SIZE)

test_qiniu.py

@@ -12,7 +12,7 @@
 from qiniu import Auth, set_default, etag, PersistentFop, build_op, op_save, Zone
 from qiniu import put_data, put_file, put_stream
 from qiniu import BucketManager, build_batch_copy, build_batch_rename, build_batch_move, build_batch_stat, \
-    build_batch_delete
+    build_batch_delete,DomainManager
 from qiniu import urlsafe_base64_encode, urlsafe_base64_decode
 
 from qiniu.compat import is_py2, is_py3, b
@@ -455,6 +455,16 @@ def test_large_size(self):
         remove_temp_file(localfile)
 
 
+class CdnTestCase(unittest.TestCase):
+    q = Auth(access_key, secret_key)
+    domain_manager = DomainManager(q)
+
+    def test_get_domain(self):
+        ret, info = self.domain_manager.get_domain('pythonsdk.qiniu.io')
+        print(info)
+        assert info.status_code == 200
+
+
 class ReadWithoutSeek(object):
     def __init__(self, str):
         self.str = str