Merge pull request #5 from bkorty/master

Bump the version to 1.0.5

docs/history.rst

@@ -1,6 +1,10 @@
 Version History
 ===============
 
+`1.0.5`_ Aug 7, 2017
+--------------------
+- Add support for allow_nonstandard_methods and max_clients
+
 `1.0.4`_ May 12, 2017
 ---------------------
 - Add support for passing the user_agent parameter per request
@@ -21,6 +25,7 @@ Version History
 ---------------------
 - Initial Version
 
+.. _1.0.5: https://github.com/sprockets/sprockets.mixins.http/compare/1.0.4...1.0.5
 .. _1.0.4: https://github.com/sprockets/sprockets.mixins.http/compare/1.0.3...1.0.4
 .. _1.0.3: https://github.com/sprockets/sprockets.mixins.http/compare/1.0.2...1.0.3
 .. _1.0.2: https://github.com/sprockets/sprockets.mixins.http/compare/1.0.1...1.0.2

setup.py

@@ -23,7 +23,7 @@ def read_requirements(name):
 
 setuptools.setup(
     name='sprockets.mixins.http',
-    version='1.0.4',
+    version='1.0.5',
     description='HTTP Client Mixin for Tornado RequestHandlers',
     long_description=open('README.rst').read(),
     url='https://github.com/sprockets/sprockets.mixins.http',

sprockets/mixins/http/__init__.py

@@ -90,7 +90,7 @@ class HTTPClientMixin(object):
         :param str auth_password: Password for HTTP authentication
         :param str user_agent: The str used for the ``User-Agent`` header,
             default used if unspecified.
-        :param bool allow_nonstardard_methods: Allow methods that don't adhere
+        :param bool allow_nonstandard_methods: Allow methods that don't adhere
             to the HTTP spec.
         :rtype: HTTPResponse