Merge pull request #367 from qiniu/open-python

修复travis CI挂了的问题，并接入了codecov

Author: bachue

.travis.yml

@@ -1,29 +1,35 @@
 sudo: false
 language: python
 python:
-- 2.6.9
-- '2.7'
-- '3.4'
-- '3.5'
+- "2.7"
+- "3.4"
+- "3.5"
 install:
 - pip install flake8
 - pip install pytest
 - pip install pytest-cov
 - pip install requests
 - pip install scrutinizer-ocular
+- pip install codecov
+
 before_script:
 - export QINIU_TEST_BUCKET="pythonsdk"
 - export QINIU_TEST_DOMAIN="pythonsdk.qiniudn.com"
 - export QINIU_TEST_ENV="travis"
 - export PYTHONPATH="$PYTHONPATH:."
+
 script:
-- if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then flake8 --show-source --max-line-length=160
-  .; fi
+- if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then flake8 --show-source --max-line-length=160 .; 
+  fi
 - py.test --cov qiniu
 - if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then ocular --data-file .coverage;
   fi
+- coverage run test_qiniu.py
 
 env:
   global:
-    secure: McZuxM4UAKabtGvCi+t1F/Spb/3Yzb6O7hEk0JLwJEYCnl7hkfV1ogAgjjYdHwkNPjOwUaz3rpdmahz64ohtpucPsIyQjgK7tigTM+UgdAcg77RflB50yJ3yCnJOHMxVRF0RNLZqFeuf3GkfnOyzZFynN+LmM5n+0/iIuC4LXgs=
-    QINIU_ACCESS_KEY=vHg2e7nOh7Jsucv2Azr5FH6omPgX22zoJRWa0FN5
+    - secure: "McZuxM4UAKabtGvCi+t1F/Spb/3Yzb6O7hEk0JLwJEYCnl7hkfV1ogAgjjYdHwkNPjOwUaz3rpdmahz64ohtpucPsIyQjgK7tigTM+UgdAcg77RflB50yJ3yCnJOHMxVRF0RNLZqFeuf3GkfnOyzZFynN+LmM5n+0/iIuC4LXgs="
+    - QINIU_ACCESS_KEY=vHg2e7nOh7Jsucv2Azr5FH6omPgX22zoJRWa0FN5
+
+after_success:
+  - codecov

README.md

@@ -3,10 +3,12 @@
 [![@qiniu on weibo](http://img.shields.io/badge/weibo-%40qiniutek-blue.svg)](http://weibo.com/qiniutek)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE)
 [![Build Status](https://travis-ci.org/qiniu/python-sdk.svg)](https://travis-ci.org/qiniu/python-sdk)
+[![GitHub release](https://img.shields.io/github/v/tag/qiniu/python-sdk.svg?label=release)](https://github.com/qiniu/python-sdk/releases)
 [![Latest Stable Version](https://img.shields.io/pypi/v/qiniu.svg)](https://pypi.python.org/pypi/qiniu)
 [![Download Times](https://img.shields.io/pypi/dm/qiniu.svg)](https://pypi.python.org/pypi/qiniu)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/qiniu/python-sdk/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/qiniu/python-sdk/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/qiniu/python-sdk/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/qiniu/python-sdk/?branch=master)
+[![Coverage Status](https://codecov.io/gh/qiniu/python-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/qiniu/python-sdk)
+
 ## 安装
 
 通过pip
@@ -19,8 +21,8 @@ $ pip install qiniu
 
 | Qiniu SDK版本 | Python 版本 |
 |:--------------------:|:---------------------------:|
-|          7.x         |          2.6, 2.7, 3.3, 3.4, 3.5|
-|          6.x         |          2.6, 2.7 |
+|          7.x         |          2.7, 3.3, 3.4, 3.5|
+|          6.x         |          2.7 |
 
 ## 使用方法
 

examples/sms_test.py

@@ -3,10 +3,10 @@
 
 from qiniu import QiniuMacAuth
 from qiniu import Sms
+import os
 
-
-access_key = ''
-secret_key = ''
+access_key = os.getenv('QINIU_ACCESS_KEY')
+secret_key = os.getenv('QINIU_SECRET_KEY')
 
 # 初始化Auth状态
 q = QiniuMacAuth(access_key, secret_key)

qiniu/auth.py

@@ -264,7 +264,7 @@ def token_of_request(
         data += "\n"
 
         if content_type and content_type != "application/octet-stream" and body:
-            if isinstance(body,bytes):
+            if isinstance(body, bytes):
                 data += body.decode(encoding='UTF-8')
             else:
                 data += body

test_qiniu.py

@@ -413,7 +413,7 @@ class DownloadTestCase(unittest.TestCase):
     def test_private_url(self):
         private_bucket = 'private-res'
         private_key = 'gogopher.jpg'
-        base_url = 'http://%s/%s' % (private_bucket + '.qiniudn.com', private_key)
+        base_url = 'http://%s/%s' % (private_bucket + '.qiniupkg.com', private_key)
         private_url = self.q.private_download_url(base_url, expires=3600)
         print(private_url)
         r = requests.get(private_url)