Merge branch 'release/1.10.8'

docs/changes.rst

@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+Version 1.10.8
+--------------
+
+**Bugs Fixed**
+
+* Ensure that ``inspect.getargspec()`` is only used with Python 2.6 where
+  required, as function has been removed in Python 3.6.
+
 Version 1.10.7
 --------------
 

docs/conf.py

@@ -50,7 +50,7 @@ copyright = u'2013-2016, Graham Dumpleton'
 # The short X.Y version.
 version = '1.10'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.7'
+release = '1.10.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -34,7 +34,7 @@ class optional_build_ext(build_ext):
 
 setup_kwargs = dict(
       name = 'wrapt',
-      version = '1.10.7',
+      version = '1.10.8',
       description = 'Module for decorators, wrappers and monkey patching.',
       long_description = open('README.rst').read(),
       author = 'Graham Dumpleton',

src/wrapt/__init__.py

@@ -1,4 +1,4 @@
-__version_info__ = ('1', '10', '7')
+__version_info__ = ('1', '10', '8')
 __version__ = '.'.join(__version_info__)
 
 from .wrappers import (ObjectProxy, CallableObjectProxy, FunctionWrapper,

src/wrapt/decorators.py

@@ -31,7 +31,7 @@ else:
         exec("""exec _code_ in _globs_, _locs_""")
 
 from functools import partial
-from inspect import getargspec, ismethod, isclass, formatargspec
+from inspect import ismethod, isclass, formatargspec
 from collections import namedtuple
 from threading import Lock, RLock
 
@@ -181,17 +181,17 @@ def decorator(wrapper=None, enabled=None, adapter=None):
     # decorator. In that case parts of the function '__code__' and
     # '__defaults__' attributes are used from the adapter function
     # rather than those of the wrapped function. This allows for the
-    # argument specification from inspect.getargspec() to be overridden
-    # with a prototype for a different function than what was wrapped.
-    # The 'enabled' argument provides a way to enable/disable the use
-    # of the decorator. If the type of 'enabled' is a boolean, then it
-    # is evaluated immediately and the wrapper not even applied if
-    # it is False. If not a boolean, it will be evaluated when the
-    # wrapper is called for an unbound wrapper, and when binding occurs
-    # for a bound wrapper. When being evaluated, if 'enabled' is callable
-    # it will be called to obtain the value to be checked. If False,
-    # the wrapper will not be called and instead the original wrapped
-    # function will be called directly instead.
+    # argument specification from inspect.getargspec() and similar
+    # functions to be overridden with a prototype for a different
+    # function than what was wrapped. The 'enabled' argument provides a
+    # way to enable/disable the use of the decorator. If the type of
+    # 'enabled' is a boolean, then it is evaluated immediately and the
+    # wrapper not even applied if it is False. If not a boolean, it will
+    # be evaluated when the wrapper is called for an unbound wrapper,
+    # and when binding occurs for a bound wrapper. When being evaluated,
+    # if 'enabled' is callable it will be called to obtain the value to
+    # be checked. If False, the wrapper will not be called and instead
+    # the original wrapped function will be called directly instead.
 
     if wrapper is not None:
         # Helper function for creating wrapper of the appropriate