Merge pull request #104 from dtynn/feature/useragent

Feature/useragent

Author: longbai

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## CHANGE LOG
 
+### v6.1.6
+
+2014-04-15 issue [#104](https://github.com/qiniu/python-sdk/pull/104)
+- [#100] 遵循PEP8语法规范
+- [#101] 增加pyflakes语法检测
+- [#103] 错误信息中加入Reqid信息，以便追溯
+- [#104] 完善User-Agent头信息，以便追溯
+
 ### v6.1.5
 
 2014-04-08 issue [#98](https://github.com/qiniu/python-sdk/pull/98)

qiniu/__init__.py

@@ -7,4 +7,4 @@
 '''
 
 # -*- coding: utf-8 -*-
-__version__ = '6.1.4'
+__version__ = '6.1.6'

qiniu/conf.py

@@ -8,4 +8,9 @@
 UP_HOST = "up.qiniu.com"
 
 from . import __version__
-USER_AGENT = "qiniu python-sdk v%s" % __version__
+import platform
+
+sys_info = "%s/%s" % (platform.system(), platform.machine())
+py_ver = platform.python_version()
+
+USER_AGENT = "QiniuPython/%s (%s) Python/%s" % (__version__, sys_info, py_ver)

qiniu/rpc.py

@@ -43,11 +43,9 @@ def call_with(self, path, body, content_type=None, content_length=None):
         if resp.status / 100 != 2:
             err_msg = ret if "error" not in ret else ret["error"]
             reqid = resp.getheader("X-Reqid", None)
-            detail = resp.getheader("x-log", None)
+            # detail = resp.getheader("x-log", None)
             if reqid is not None:
                 err_msg += ", reqid:%s" % reqid
-            if detail is not None:
-                err_msg += ", detail:%s" % detail
 
             return None, err_msg