Merge branch 'release/v0.5.2' into develop

CONTRIBUTORS.txt

@@ -1,3 +1,6 @@
 Ace Kwok / @doraemonext
 @yxjsolid
 @zxygentoo
+@JohnnyZhao
+@svcvit
+@mtunique

README.rst

@@ -1,7 +1,7 @@
 微信公众平台 Python 开发包
 ===========================
 
-当前最新版本：v0.5.1
+当前最新版本：v0.5.2
 
 非官方微信公众平台 Python 开发包，包括官方接口和非官方接口。
 
@@ -59,6 +59,11 @@
 ChangeLog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+v0.5.2
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* 官方接口中的 upload_media 方法增加 StringIO 支持
+
 v0.5.1
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

docs/conf.py

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

setup.py

@@ -1,22 +1,22 @@
 # -*- coding: utf-8 -*-
-#!/usr/bin/env python
+# !/usr/bin/env python
 
 from setuptools import setup, find_packages
 
 setup(
-    name = 'wechat-sdk',
-    version = '0.5.1',
-    keywords = ('wechat', 'sdk', 'wechat sdk'),
-    description = u'微信公众平台Python开发包',
-    long_description = open("README.rst").read(),
-    license = 'BSD License',
+    name='wechat-sdk',
+    version='0.5.2',
+    keywords=('wechat', 'sdk', 'wechat sdk'),
+    description=u'微信公众平台Python开发包',
+    long_description=open("README.rst").read(),
+    license='BSD License',
 
-    url = 'https://github.com/doraemonext/wechat-python-sdk',
-    author = 'doraemonext',
-    author_email = 'doraemonext@gmail.com',
+    url='https://github.com/doraemonext/wechat-python-sdk',
+    author='doraemonext',
+    author_email='doraemonext@gmail.com',
 
-    packages = find_packages(),
-    include_package_data = True,
-    platforms = 'any',
+    packages=find_packages(),
+    include_package_data=True,
+    platforms='any',
     install_requires=open("requirements.txt").readlines(),
 )