Merge pull request #285 from jemygraw/master

fix the http rft time format from timestamp using utc timezone

Author: jemygraw

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.1.7 (2017-09-27)
+
+* 修复从时间戳获取rfc http格式的时间字符串问题
+
 ## 7.1.6 (2017-09-26)
 
 * 给 `put_file` 功能增加保持本地文件Last Modified功能，以支持切换源站的客户CDN不回源

qiniu/__init__.py

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

qiniu/utils.py

@@ -167,6 +167,6 @@ def rfc_from_timestamp(timestamp):
     Args:
         timestamp: 整型Unix时间戳（单位秒）
     """
-    last_modified_date = datetime.fromtimestamp(timestamp)
+    last_modified_date = datetime.utcfromtimestamp(timestamp)
     last_modified_str = last_modified_date.strftime('%a, %d %b %Y %H:%M:%S GMT')
     return last_modified_str