7.0

Author: longbai

CHANGELOG.md

@@ -0,0 +1,11 @@
+#Changelog
+
+
+## 7.0.0 (2014-11-13)
+
+### 增加
+* 简化上传接口
+* 自动选择断点续上传还是直传
+* 重构代码，内部结构更清晰，便于更换不同的http实现
+* 同时支持python 2.x 和 3.x
+* 增加pfop支持

CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# 贡献代码指南
+
+我们非常欢迎大家来贡献代码，我们会向贡献者致以最诚挚的敬意。
+
+一般可以通过在Github上提交[Pull Request](https://github.com/qiniu/python-sdk)来贡献代码。
+
+## Pull Request要求
+
+- **代码规范** 遵从pep8，pythonic。
+
+- **代码格式** 提交前 请按 pep8 进行格式化。
+
+- **必须添加测试！** - 如果没有测试（单元测试、集成测试都可以），那么提交的补丁是不会通过的。
+
+- **记得更新文档** - 保证`README.md`以及其他相关文档及时更新，和代码的变更保持一致性。
+
+- **考虑我们的发布周期** - 我们的版本号会服从[SemVer v2.0.0](http://semver.org/)，我们绝对不会随意变更对外的API。
+
+- **创建feature分支** - 最好不要从你的master分支提交 pull request。
+
+- **一个feature提交一个pull请求** - 如果你的代码变更了多个操作，那就提交多个pull请求吧。
+
+- **清晰的commit历史** - 保证你的pull请求的每次commit操作都是有意义的。如果你开发中需要执行多次的即时commit操作，那么请把它们放到一起再提交pull请求。
+
+## 运行测试
+
+``` bash
+py.test
+
+```

LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Qiniu, Ltd.<[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

README.md

@@ -0,0 +1,69 @@
+# Qiniu Python SDK
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
+[![Build Status](https://travis-ci.org/qiniu/python-sdk.svg)](https://travis-ci.org/qiniu/python-sdk)
+[![Latest Stable Version](https://badge.fury.io/co/Qiniu.png)](https://github.com/qiniu/python-sdk/releases)
+
+## 安装
+
+通过pip
+
+```bash
+pip install qiniu
+```
+
+## 运行环境
+
+| Qiniu SDK版本 | Python 版本 |
+|:--------------------:|:---------------------------:|
+|          7.x         |          2.6, 2.7, 3.3, 3.4 |
+|          6.x         |          2.6, 2.7 |
+
+## 使用方法
+
+```python
+import qiniu
+...
+    q = qiniu.Auth(access_key, secret_key)
+    key = 'hello'
+    data = 'hello qiniu!'
+    token = q.upload_token(bucket_name)
+    ret, info = put_data(token, key, data)
+    if ret is not None:
+        print('All is OK')
+    else:
+        print(info) # error message in info
+...
+```
+
+## 测试
+
+``` bash
+py.test
+```
+
+## 常见问题
+
+- 第二个参数info保留了请求响应的信息，失败情况下ret 为none, 将info可以打印出来，提交给我们。
+- API 的使用 demo 可以参考 [单元测试](https://github.com/qiniu/python-sdk/blob/master/test_qiniu.py)。
+
+## 代码贡献
+
+详情参考[代码提交指南](https://github.com/qiniu/python-sdk/blob/master/CONTRIBUTING.md)。
+
+## 贡献记录
+
+- [所有贡献者](https://github.com/qiniu/python-sdk/contributors)
+
+## 联系我们
+
+- 如果需要帮助，请提交工单（在portal右侧点击咨询和建议提交工单，或者直接向 [email protected] 发送邮件）
+- 如果有什么问题，可以到问答社区提问，[问答社区](http://qiniu.segmentfault.com/)
+- 更详细的文档，见[官方文档站](http://developer.qiniu.com/)
+- 如果发现了bug， 欢迎提交 [issue](https://github.com/qiniu/python-sdk/issues)
+- 如果有功能需求，欢迎提交 [issue](https://github.com/qiniu/python-sdk/issues)
+- 如果要提交代码，欢迎提交 pull request
+- 欢迎关注我们的[微信](http://www.qiniu.com/#weixin) [微博](http://weibo.com/qiniutek)，及时获取动态信息。
+
+## 代码许可
+
+The MIT License (MIT).详情见 [License文件](https://github.com/qiniu/python-sdk/blob/master/LICENSE).

qiniu/__init__.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+'''
+Qiniu Resource Storage SDK for Python
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+For detailed document, please see:
+<http://developer.qiniu.com>
+'''
+
+# flake8: noqa
+
+__version__ = '7.0.0'
+
+from .auth import Auth
+
+from .config import set_default
+
+from .services.storage.bucket import BucketManager, build_batch_copy, build_batch_rename, build_batch_move, build_batch_stat, build_batch_delete
+from .services.storage.uploader import put_data, put_file, put_stream
+from .services.processing.pfop import PersistentFop
+from .services.processing.cmd import build_op, pipe_cmd, op_save
+
+from .utils import urlsafe_base64_encode, urlsafe_base64_decode, etag, entry

qiniu/auth.py

@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+
+import hmac
+import time
+from hashlib import sha1
+
+from requests.auth import AuthBase
+
+from .compat import urlparse, json, b
+from .utils import urlsafe_base64_encode
+
+
+_policy_fields = set([
+    'callbackUrl',
+    'callbackBody',
+    'callbackHost',
+
+    'returnUrl',
+    'returnBody',
+
+    'endUser',
+    'saveKey',
+    'insertOnly',
+
+    'detectMime',
+    'mimeLimit',
+    'fsizeLimit',
+
+    'persistentOps',
+    'persistentNotifyUrl',
+    'persistentPipeline',
+])
+
+_deprecated_policy_fields = set([
+    'asyncOps'
+])
+
+
+class Auth(object):
+
+    def __init__(self, access_key, secret_key):
+        self.__checkKey(access_key, secret_key)
+        self.__access_key, self.__secret_key = access_key, secret_key
+        self.__secret_key = b(self.__secret_key)
+
+    def __token(self, data):
+        data = b(data)
+        hashed = hmac.new(self.__secret_key, data, sha1)
+        return urlsafe_base64_encode(hashed.digest())
+
+    def token(self, data):
+        return '{0}:{1}'.format(self.__access_key, self.__token(data))
+
+    def token_with_data(self, data):
+        data = urlsafe_base64_encode(data)
+        return '{0}:{1}:{2}'.format(self.__access_key, self.__token(data), data)
+
+    def token_of_request(self, url, body=None, content_type=None):
+        parsed_url = urlparse(url)
+        query = parsed_url.query
+        path = parsed_url.path
+        data = path
+        if query != '':
+            data = ''.join([data, '?', query])
+        data = ''.join([data, "\n"])
+
+        if body:
+            mimes = [
+                'application/x-www-form-urlencoded',
+            ]
+            if content_type in mimes:
+                data += body
+
+        return '{0}:{1}'.format(self.__access_key, self.__token(data))
+
+    @staticmethod
+    def __checkKey(access_key, secret_key):
+        if not (access_key and secret_key):
+            raise ValueError('invalid key')
+
+    def private_download_url(self, url, expires=3600):
+        '''
+         *  return private url
+        '''
+
+        deadline = int(time.time()) + expires
+        if '?' in url:
+            url += '&'
+        else:
+            url += '?'
+        url = '{0}e={1}'.format(url, str(deadline))
+
+        token = self.token(url)
+        return '{0}&token={1}'.format(url, token)
+
+    def upload_token(self, bucket, key=None, expires=3600, policy=None, strict_policy=True):
+        if bucket is None or bucket == '':
+            raise ValueError('invalid bucket name')
+
+        scope = bucket
+        if key is not None:
+            scope = '{0}:{1}'.format(bucket, key)
+
+        args = dict(
+            scope=scope,
+            deadline=int(time.time()) + expires,
+        )
+
+        if policy is not None:
+            self.__copy_policy(policy, args, strict_policy)
+
+        return self.__upload_token(args)
+
+    def __upload_token(self, policy):
+        data = json.dumps(policy, separators=(',', ':'))
+        return self.token_with_data(data)
+
+    def verify_callback(self, origin_authorization, url, body):
+        token = self.token_of_request(url, body, 'application/x-www-form-urlencoded')
+        authorization = 'QBox {0}'.format(token)
+        return origin_authorization == authorization
+
+    @staticmethod
+    def __copy_policy(policy, to, strict_policy):
+        for k, v in policy.items():
+            if k in _deprecated_policy_fields:
+                raise ValueError(k + ' has deprecated')
+            if (not strict_policy) or k in _policy_fields:
+                to[k] = v
+
+
+class RequestsAuth(AuthBase):
+    def __init__(self, auth):
+        self.auth = auth
+
+    def __call__(self, r):
+        token = None
+        if r.body is not None and r.headers['Content-Type'] == 'application/x-www-form-urlencoded':
+            token = self.auth.token_of_request(r.url, r.body, 'application/x-www-form-urlencoded')
+        else:
+            token = self.auth.token_of_request(r.url)
+        r.headers['Authorization'] = 'QBox {0}'.format(token)
+        return r

qiniu/compat.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+
+"""
+pythoncompat
+"""
+
+import sys
+
+try:
+    import simplejson as json
+except (ImportError, SyntaxError):
+    # simplejson does not support Python 3.2, it thows a SyntaxError
+    # because of u'...' Unicode literals.
+    import json  # noqa
+
+
+# -------
+# Pythons
+# -------
+
+_ver = sys.version_info
+
+#: Python 2.x?
+is_py2 = (_ver[0] == 2)
+
+#: Python 3.x?
+is_py3 = (_ver[0] == 3)
+
+
+# ---------
+# Specifics
+# ---------
+
+if is_py2:
+    from urlparse import urlparse  # noqa
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+
+    builtin_str = str
+    bytes = str
+    str = unicode  # noqa
+    basestring = basestring  # noqa
+    numeric_types = (int, long, float)  # noqa
+
+    def b(s):
+        return s
+
+    def s(b):
+        return b
+
+    def u(s):
+        return unicode(s, 'unicode_escape')  # noqa
+
+elif is_py3:
+    from urllib.parse import urlparse  # noqa
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+
+    builtin_str = str
+    str = str
+    bytes = bytes
+    basestring = (str, bytes)
+    numeric_types = (int, float)
+
+    def b(s):
+        if isinstance(s, str):
+            return s.encode('utf-8')
+        return s
+
+    def s(b):
+        if isinstance(b, bytes):
+            b = b.decode('utf-8')
+        return b
+
+    def u(s):
+        return s