Merge remote-tracking branch 'upstream/master'

Author: alzhang

.travis.yml

@@ -6,6 +6,8 @@ python:
 - 3.4
 - 3.5
 install:
+- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then travis_retry pip install pycryptodome==3.6.6;
+  fi
 - pip install crcmod requests nose nose-cov python-coveralls pycryptodome aliyun-python-sdk-sts
   aliyun-python-sdk-kms
 - pip install --upgrade mock

CHANGELOG.rst

@@ -3,6 +3,16 @@ OSS SDK for Python 版本记录
 
 Python SDK的版本号遵循 `Semantic Versioning <http://semver.org/>`_ 规则。
 
+Version 2.6.1
+-------------
+
+- 修复: 不指定默认的日志级别
+- 修复: 修复日志中存在的中文标点符号的问题
+- 增加: 帮助文档增加如何设置日志级别的方法说明
+- 修复: 当传入的playlist为空时，不指定playlist为生成推流签名的url的参数
+- 修复: 初始化LiveChannelInfo实例时，使用默认的构造函数初始化target成员
+- 修复: 有些调试信息的日志，修改成debug级别，避免过多的日志打印
+
 Version 2.6.0
 -------------
 

README-CN.rst

@@ -93,6 +93,17 @@ Python 2.6，2.7，3.3，3.4，3.5
     except oss2.exceptions.NoSuchKey as e:
         print('{0} not found: http_status={1}, request_id={2}'.format(key, e.status, e.request_id))
 
+
+
+设置日志
+---------------
+使用下面的代码可以设置oss2的日志级别.
+
+.. code-block:: python
+
+    import logging
+    logging.getLogger('oss2').setLevel(logging.WARNING)
+
 测试
 ----
 

README.rst

@@ -93,6 +93,15 @@ The Python SDK interface will throw an exception in case of an error (see oss2.e
     except oss2.exceptions.NoSuchKey as e:
         print('{0} not found: http_status={1}, request_id={2}'.format(key, e.status, e.request_id))
 
+Setup Logging
+---------------
+
+The following code can set the logging level of 'oss2'.
+ .. code-block:: python
+
+    import logging
+    logging.getLogger('oss2').setLevel(logging.WARNING)
+
 Testing
 -------
 

examples/object_basic.py

@@ -34,6 +34,12 @@
 # 上传一段字符串。Object名是motto.txt，内容是一段名言。
 bucket.put_object('motto.txt', 'Never give up. - Jack Ma')
 
+# 获取Object的metadata
+object_meta = bucket.get_object_meta('你的对象名')
+print('last modified: ' + object_meta.last_modified)
+print('etag: ' + object_meta.etag)
+print('size: ' + object_meta.content_length)
+
 # 下载到本地文件
 bucket.get_object_to_file('motto.txt', '本地文件名.txt')
 

oss2/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.6.0'
+__version__ = '2.6.1'
 
 from . import models, exceptions
 
@@ -57,6 +57,3 @@ def set_stream_logger(name='oss2', level=logging.DEBUG, format_string=None):
     formatter = logging.Formatter(format_string)
     fh.setFormatter(formatter)
     logger.addHandler(fh)
-
-
-set_stream_logger('oss2', logging.INFO)

oss2/api.py

@@ -17,10 +17,10 @@
 
 def make_auth(access_key_id, access_key_secret, auth_version=AUTH_VERSION_1):
     if auth_version == AUTH_VERSION_2:
-        logger.info("Init Auth V2: access_key_id: {0}, access_key_secret: ******".format(access_key_id))
+        logger.debug("Init Auth V2: access_key_id: {0}, access_key_secret: ******".format(access_key_id))
         return AuthV2(access_key_id.strip(), access_key_secret.strip())
     else:
-        logger.info("Init Auth v1: access_key_id: {0}, access_key_secret: ******".format(access_key_id))
+        logger.debug("Init Auth v1: access_key_id: {0}, access_key_secret: ******".format(access_key_id))
         return Auth(access_key_id.strip(), access_key_secret.strip())
 
 
@@ -30,7 +30,7 @@ def __init__(self, access_key_id, access_key_secret):
         self.id = access_key_id.strip()
         self.secret = access_key_secret.strip()
 
-    def _sign_rtmp_url(self, url, bucket_name, channel_name, playlist_name, expires, params):
+    def _sign_rtmp_url(self, url, bucket_name, channel_name, expires, params):
         expiration_time = int(time.time()) + expires
 
         canonicalized_resource = "/%s/%s" % (bucket_name, channel_name)
@@ -156,7 +156,7 @@ def __param_to_query(self, k, v):
             return k + '=' + v
         else:
             return k
-    
+
 
 class AnonymousAuth(object):
     """用于匿名访问。
@@ -171,9 +171,9 @@ def _sign_request(self, req, bucket_name, key):
     def _sign_url(self, req, bucket_name, key, expires):
         return req.url + '?' + '&'.join(_param_to_quoted_query(k, v) for k, v in req.params.items())
 
-    def _sign_rtmp_url(self, url, bucket_name, channel_name, playlist_name, expires, params):
+    def _sign_rtmp_url(self, url, bucket_name, channel_name, expires, params):
         return url + '?' + '&'.join(_param_to_quoted_query(k, v) for k, v in params.items())
-        
+
 
 class StsAuth(object):
     """用于STS临时凭证访问。可以通过官方STS客户端获得临时密钥（AccessKeyId、AccessKeySecret）以及临时安全令牌（SecurityToken）。
@@ -187,7 +187,7 @@ class StsAuth(object):
     :param str auth_version: 需要生成auth的版本，默认为AUTH_VERSION_1(v1)
     """
     def __init__(self, access_key_id, access_key_secret, security_token, auth_version=AUTH_VERSION_1):
-        logger.info("Init StsAuth: access_key_id: {0}, access_key_secret: ******, security_token: ******".format(access_key_id))
+        logger.debug("Init StsAuth: access_key_id: {0}, access_key_secret: ******, security_token: ******".format(access_key_id))
         self.__auth = make_auth(access_key_id, access_key_secret, auth_version)
         self.__security_token = security_token
 
@@ -199,9 +199,9 @@ def _sign_url(self, req, bucket_name, key, expires):
         req.params['security-token'] = self.__security_token
         return self.__auth._sign_url(req, bucket_name, key, expires)
 
-    def _sign_rtmp_url(self, url, bucket_name, channel_name, playlist_name, expires, params):
+    def _sign_rtmp_url(self, url, bucket_name, channel_name, expires, params):
         params['security-token'] = self.__security_token
-        return self.__auth._sign_rtmp_url(url, bucket_name, channel_name, playlist_name, expires, params)
+        return self.__auth._sign_rtmp_url(url, bucket_name, channel_name, expires, params)
 
 
 def _param_to_quoted_query(k, v):

oss2/auth.py

@@ -232,12 +232,14 @@ class AccessDenied(ServerError):
 
 class SelectOperationFailed(ServerError):
     code = 'SelectOperationFailed'
-    def __init__(self, status, message):
+    def __init__(self, status, code, message):
         self.status = status
+        self.code = code
         self.message = message
 
     def __str__(self):
         error = {'status': self.status,
+                 'code': self.code,
                  'details': self.message}
         return str(error)
 

oss2/exceptions.py

@@ -95,8 +95,10 @@ def __init__(self, resp):
         for data in self.select_resp: # waiting the response body to finish
             pass
 
-        self.csv_rows = self.select_resp.rows
-        self.csv_splits = self.select_resp.splits
+        self.csv_rows = self.select_resp.rows  # to be compatible with previous version. 
+        self.csv_splits = self.select_resp.splits  # to be compatible with previous version. 
+        self.rows = self.csv_rows 
+        self.splits = self.csv_splits
 
 
 class GetObjectMetaResult(RequestResult):
@@ -671,7 +673,7 @@ class LiveChannelInfo(object):
     def __init__(self,
             status = 'enabled',
             description = '',
-            target = None,
+            target = LiveChannelInfoTarget(),
             last_modified = None,
             name = None,
             play_url = None,