Merge branch 'release/0.3.2' into develop

docs/conf.py

@@ -48,9 +48,9 @@ copyright = u'2011, Kenneth Reitz'
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.0'
+version = '0.3.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.0'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

requests/core.py

@@ -25,8 +25,8 @@ from .packages.poster.streaminghttp import register_openers, get_handlers
 
 
 __title__ = 'requests'
-__version__ = '0.3.1'
-__build__ = 0x000301
+__version__ = '0.3.2'
+__build__ = 0x000302
 __author__ = 'Kenneth Reitz'
 __license__ = 'ISC'
 __copyright__ = 'Copyright 2011 Kenneth Reitz'

setup.py

@@ -8,7 +8,7 @@ import requests
 from distutils.core import setup
 
 
-    
+
 if sys.argv[-1] == "publish":
     os.system("python setup.py sdist upload")
     sys.exit()
@@ -16,10 +16,11 @@ if sys.argv[-1] == "publish":
 if sys.argv[-1] == "test":
     os.system("python test_requests.py")
     sys.exit()
-    
+
 required = []
 
-# if python > 2.6, require simplejson
+if sys.version_info[:2] < (2,6):
+    required.append('simplejson')
 
 setup(
     name='requests',