Merge branch 'release/v0.5.3'

doraemonext · Feb 28, 2015 · 8200858 · 8200858
2 parents eafd275 + 04bbc13
commit 8200858
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/README.rst b/README.rst
@@ -59,6 +59,10 @@
 ChangeLog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+v0.5.3
+
+* 修复 hashlib.sha1 无法 decode unicode 字符串问题 (感谢 `JohnnyZhao <https://github.com/JohnnyZhao>`_)
+
 v0.5.2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.5.2'
+version = '0.5.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.2'
+release = '0.5.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='wechat-sdk',
-    version='0.5.2',
+    version='0.5.3',
     keywords=('wechat', 'sdk', 'wechat sdk'),
     description=u'微信公众平台Python开发包',
     long_description=open("README.rst").read(),

diff --git a/wechat_sdk/basic.py b/wechat_sdk/basic.py
@@ -65,7 +65,7 @@ def check_signature(self, signature, timestamp, nonce):
         tmp_list = [self.__token, timestamp, nonce]
         tmp_list.sort()
         tmp_str = ''.join(tmp_list)
-        if signature == hashlib.sha1(tmp_str).hexdigest():
+        if signature == hashlib.sha1(tmp_str.encode('utf-8')).hexdigest():
             return True
         else:
             return False
@@ -90,7 +90,7 @@ def generate_jsapi_signature(self, timestamp, noncestr, url, jsapi_ticket=None):
         keys = data.keys()
         keys.sort()
         data_str = '&'.join(['%s=%s' % (key, data[key]) for key in keys])
-        signature = hashlib.sha1(data_str).hexdigest()
+        signature = hashlib.sha1(data_str.encode('utf-8')).hexdigest()
         return signature
 
     def parse_data(self, data):