appmap 1.15.2__tar.gz → 1.16.0__tar.gz

{appmap-1.15.2 → appmap-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appmap
-Version: 1.15.2
+Version: 1.16.0
 Summary: Create AppMap files by recording a Python application.
 Home-page: https://github.com/applandinc/appmap-python
 License: MIT
@@ -26,7 +26,7 @@ Requires-Dist: PyYAML (>=5.3.0)
 Requires-Dist: importlib-metadata (>=0.8)
 Requires-Dist: importlib-resources (>=5.4.0,<6.0.0)
 Requires-Dist: inflection (>=0.3.0)
-Requires-Dist: packaging (>=21.3)
+Requires-Dist: packaging (>=19.0)
 Description-Content-Type: text/markdown
 
 - [About](#about)
@@ -35,6 +35,7 @@ Description-Content-Type: text/markdown
   - [Getting the code](#getting-the-code)
   - [Python version support](#python-version-support)
   - [Dependency management](#dependency-management)
+    - [wrapt](#wrapt)
   - [Linting](#linting)
   - [Testing](#testing)
     - [pytest](#pytest)
@@ -102,6 +103,14 @@ oldest version currently supported (see the
 % poetry install
 ```
 
+### wrapt
+The one dependency that is not managed using `poetry` is `wrapt`. Because it's possible that
+projects that use `appmap` may also need an unmodified version of `wrapt` (e.g. `pylint` depends on
+`astroid`, which in turn depends on `wrapt`), we use
+[vendoring](https://github.com/pradyunsg/vendoring) to vendor `wrapt`.
+
+To update `wrapt`, use `tox` (described below) to run the `vendoring` environment.
+
 ## Linting
 [pylint](https://www.pylint.org/) for linting:
 
@@ -114,9 +123,9 @@ Your code has been rated at 10.00/10 (previous run: 10.00/10, +0.00)
 
 ```
 
-[Note that the current configuration requires a 10.0 for the Travis build to pass. To make
-this easier to achieve, convention and refactoring checks have both been disabled. They
-should be reenabled as soon as possible.]
+[Note that the current configuration has a threshold set which must be met for the Travis build to
+pass. To make this easier to achieve, a number of checks have both been disabled. They should be
+reenabled as soon as possible.]
 
 
 ## Testing

{appmap-1.15.2 → appmap-1.16.0}/README.md

@@ -4,6 +4,7 @@
   - [Getting the code](#getting-the-code)
   - [Python version support](#python-version-support)
   - [Dependency management](#dependency-management)
+    - [wrapt](#wrapt)
   - [Linting](#linting)
   - [Testing](#testing)
     - [pytest](#pytest)
@@ -71,6 +72,14 @@ oldest version currently supported (see the
 % poetry install
 ```
 
+### wrapt
+The one dependency that is not managed using `poetry` is `wrapt`. Because it's possible that
+projects that use `appmap` may also need an unmodified version of `wrapt` (e.g. `pylint` depends on
+`astroid`, which in turn depends on `wrapt`), we use
+[vendoring](https://github.com/pradyunsg/vendoring) to vendor `wrapt`.
+
+To update `wrapt`, use `tox` (described below) to run the `vendoring` environment.
+
 ## Linting
 [pylint](https://www.pylint.org/) for linting:
 
@@ -83,9 +92,9 @@ Your code has been rated at 10.00/10 (previous run: 10.00/10, +0.00)
 
 ```
 
-[Note that the current configuration requires a 10.0 for the Travis build to pass. To make
-this easier to achieve, convention and refactoring checks have both been disabled. They
-should be reenabled as soon as possible.]
+[Note that the current configuration has a threshold set which must be met for the Travis build to
+pass. To make this easier to achieve, a number of checks have both been disabled. They should be
+reenabled as soon as possible.]
 
 
 ## Testing

{appmap-1.15.2 → appmap-1.16.0}/_appmap/importer.py

@@ -7,7 +7,7 @@ from collections import namedtuple
 from collections.abc import MutableSequence
 from functools import reduce
 
-from appmap import wrapt
+from _appmap import wrapt
 
 from .env import Env
 from .utils import FnType
@@ -165,9 +165,7 @@ class Importer:
 
         logger.debug("do_import, mod %s args %s kwargs %s", mod, args, kwargs)
         if not cls.filter_chain:
-            cls.filter_chain = reduce(
-                lambda acc, e: e(acc), cls.filter_stack, NullFilter(None)
-            )
+            cls.filter_chain = reduce(lambda acc, e: e(acc), cls.filter_stack, NullFilter(None))
 
         def instrument_functions(filterable, selected_functions=None):
             logger.debug("  looking for members of %s", filterable.obj)
@@ -264,12 +262,26 @@ def wrapped_find_spec(find_spec, _, args, kwargs):
 
 
 def wrap_finder_find_spec(finder):
-    find_spec = getattr(finder, "find_spec", None)
-    if find_spec is None:
-        logger.debug("no find_spec for finder %r", finder)
-        return
+    # Prior to 3.11, it worked fine to just grab find_spec from the finder and wrap it. The
+    # implementation of builtin finders must have changed with 3.11, because we now need the same
+    # kind of workaround we use above for exec_module.
+    if sys.version_info[1] < 11:
+        find_spec = getattr(finder, "find_spec", None)
+        if find_spec is None:
+            logger.debug("no find_spec for finder %r", finder)
+            return
 
-    finder.find_spec = wrap_finder_function(find_spec, wrapped_find_spec)
+        finder.find_spec = wrap_finder_function(find_spec, wrapped_find_spec)
+    else:
+        find_spec = inspect.getattr_static(finder, "find_spec", None)
+        if find_spec is None:
+            logger.debug("no find_spec for finder %r", finder)
+            return
+
+        if isinstance(find_spec, (classmethod, staticmethod)):
+            finder.find_spec = wrap_finder_function(find_spec, wrapped_find_spec)
+        else:
+            finder.find_spec = wrap_finder_function(finder.find_spec, wrapped_find_spec)
 
 
 class MetapathObserver(MutableSequence):

appmap-1.15.2/_appmap/test/data/unittest/expected/unittest.appmap.json → appmap-1.16.0/_appmap/test/data/unittest/expected/pytest.appmap.json

@@ -12,13 +12,13 @@
     "recording": {
       "defined_class": "simple.test_simple.UnitTestTest",
       "method_id": "test_hello_world",
-      "source_location": "simple/test_simple.py:14"
+      "source_location": "simple/test_simple.py:12"
     },
     "name": "Unit test test hello world",
     "feature": "Hello world",
     "app": "Simple",
     "recorder": {
-      "name": "unittest",
+      "name": "pytest",
       "type": "tests"
     },
     "test_status": "succeeded"
@@ -28,7 +28,7 @@
       "defined_class": "simple.test_simple.UnitTestTest",
       "method_id": "test_hello_world",
       "path": "simple/test_simple.py",
-      "lineno": 14,
+      "lineno": 13,
       "static": false,
       "receiver": {
         "name": "self",
@@ -178,7 +178,7 @@
                 {
                   "name": "test_hello_world",
                   "type": "function",
-                  "location": "simple/test_simple.py:14",
+                  "location": "simple/test_simple.py:13",
                   "static": false
                 }
               ]

appmap-1.15.2/_appmap/test/data/unittest/expected/pytest.appmap.json → appmap-1.16.0/_appmap/test/data/unittest/expected/unittest.appmap.json

@@ -18,7 +18,7 @@
     "feature": "Hello world",
     "app": "Simple",
     "recorder": {
-      "name": "pytest",
+      "name": "unittest",
       "type": "tests"
     },
     "test_status": "succeeded"
@@ -28,7 +28,7 @@
       "defined_class": "simple.test_simple.UnitTestTest",
       "method_id": "test_hello_world",
       "path": "simple/test_simple.py",
-      "lineno": 14,
+      "lineno": 13,
       "static": false,
       "receiver": {
         "name": "self",
@@ -178,7 +178,7 @@
                 {
                   "name": "test_hello_world",
                   "type": "function",
-                  "location": "simple/test_simple.py:14",
+                  "location": "simple/test_simple.py:13",
                   "static": false
                 }
               ]

{appmap-1.15.2 → appmap-1.16.0}/_appmap/test/data/unittest/simple/test_simple.py

@@ -7,7 +7,6 @@ import simple
 # finders correctly.
 from decouple import config
 
-import appmap.unittest
 
 
 class UnitTestTest(unittest.TestCase):

{appmap-1.15.2 → appmap-1.16.0}/_appmap/test/test_labels.py

@@ -1,6 +1,6 @@
 import pytest
 
-from appmap.wrapt import BoundFunctionWrapper, FunctionWrapper
+from _appmap.wrapt import BoundFunctionWrapper, FunctionWrapper
 
 
 @pytest.mark.appmap_enabled

{appmap-1.15.2 → appmap-1.16.0}/_appmap/test/test_params.py

@@ -7,9 +7,9 @@ import sys
 
 import pytest
 
+from _appmap import wrapt
 from _appmap.event import CallEvent
 from _appmap.importer import FilterableCls, FilterableFn
-from appmap import wrapt
 
 empty_args = {"name": "args", "class": "builtins.tuple", "kind": "rest", "value": "()"}
 

{appmap-1.15.2 → appmap-1.16.0}/_appmap/test/test_recording.py

@@ -10,7 +10,7 @@ import pytest
 import appmap
 from _appmap.event import Event
 from _appmap.recorder import Recorder, ThreadRecorder
-from appmap.wrapt import FunctionWrapper
+from _appmap.wrapt import FunctionWrapper
 
 from .normalize import normalize_appmap, remove_line_numbers
 

{appmap-1.15.2 → appmap-1.16.0}/_appmap/test/test_test_frameworks.py

@@ -136,6 +136,12 @@ def test_write_appmap(tmp_path):
 
 @pytest.fixture(name="testdir")
 def fixture_runner_testdir(request, data_dir, pytester, monkeypatch):
+    # We need to set environment variables to control how tests are run. This will only work
+    # properly if pytester runs pytest in a subprocess.
+    assert (
+        pytester._method == "subprocess"  # pylint:disable=protected-access
+    ), "must run pytest in a subprocess"
+
     # The init subdirectory contains a sitecustomize.py file that
     # imports the appmap module. This simulates the way a real
     # installation works, performing the same function as the the

appmap-1.16.0/_appmap/unittest.py

@@ -0,0 +1,69 @@
+import sys
+import unittest
+from contextlib import contextmanager
+
+from _appmap import testing_framework, wrapt
+from _appmap.utils import get_function_location
+
+_session = testing_framework.session("unittest", "tests")
+
+
+def _get_test_location(cls, method_name):
+    fn = getattr(cls, method_name)
+    return get_function_location(fn)
+
+
+if sys.version_info[1] < 8:
+    # Prior to 3.8, unittest called the test case's test method directly, which left us without an
+    # opportunity to hook it. So, instead, instrument unittest.case._Outcome.testPartExecutor, a
+    # method used to run test cases. `isTest` will be True when the part is the actual test method,
+    # False when it's setUp or teardown.
+    @wrapt.patch_function_wrapper("unittest.case", "_Outcome.testPartExecutor")
+    @contextmanager
+    def testPartExecutor(wrapped, _, args, kwargs):
+        def _args(test_case, *_, isTest=False, **__):
+            return (test_case, isTest)
+
+        test_case, is_test = _args(*args, **kwargs)
+        already_recording = getattr(test_case, "_appmap_pytest_recording", None)
+        # fmt: off
+        if (
+            (not is_test)
+            or isinstance(test_case, unittest.case._SubTest) # pylint: disable=protected-access
+            or already_recording
+        ):
+        # fmt: on
+            with wrapped(*args, **kwargs):
+                yield
+            return
+
+        method_name = test_case.id().split(".")[-1]
+        location = _get_test_location(test_case.__class__, method_name)
+        with _session.record(
+            test_case.__class__, method_name, location=location
+        ) as metadata:
+            if metadata:
+                with wrapped(
+                    *args, **kwargs
+                ), testing_framework.collect_result_metadata(metadata):
+                    yield
+            else:
+                # session.record may return None
+                yield
+
+else:
+    # As of 3.8, unittest.case.TestCase now calls the test's method indirectly, through
+    # TestCase._callTestMethod. Hook that to manage a recording session.
+    @wrapt.patch_function_wrapper("unittest.case", "TestCase._callTestMethod")
+    def callTestMethod(wrapped, test_case, args, kwargs):
+        already_recording = getattr(test_case, "_appmap_pytest_recording", None)
+        if already_recording:
+            wrapped(*args, **kwargs)
+            return
+
+        method_name = test_case.id().split(".")[-1]
+        location = _get_test_location(test_case.__class__, method_name)
+        with _session.record(test_case.__class__, method_name, location=location) as metadata:
+            if metadata:
+                with testing_framework.collect_result_metadata(metadata):
+                    wrapped(*args, **kwargs)

{appmap-1.15.2 → appmap-1.16.0}/appmap/flask.py

@@ -9,6 +9,7 @@ from flask.cli import ScriptInfo
 from werkzeug.exceptions import BadRequest, UnsupportedMediaType
 from werkzeug.middleware.dispatcher import DispatcherMiddleware
 
+from _appmap import wrapt
 from _appmap.env import Env
 from _appmap.event import HttpServerRequestEvent, HttpServerResponseEvent
 from _appmap.flask import app as remote_recording_app
@@ -16,7 +17,6 @@ from _appmap.metadata import Metadata
 from _appmap.utils import patch_class, values_dict
 from _appmap.web_framework import JSON_ERRORS, AppmapMiddleware, MiddlewareInserter
 from _appmap.web_framework import TemplateHandler as BaseTemplateHandler
-from appmap import wrapt
 
 try:
     # pylint: disable=unused-import

{appmap-1.15.2 → appmap-1.16.0}/appmap/pytest.py

@@ -1,8 +1,7 @@
 import pytest
 
-from _appmap import testing_framework
+from _appmap import testing_framework, wrapt
 from _appmap.env import Env
-from appmap import wrapt
 
 logger = Env.current.getLogger(__name__)
 

appmap-1.16.0/appmap/unittest.py

@@ -0,0 +1,7 @@
+from _appmap.env import Env
+
+logger = Env.current.getLogger(__name__)
+
+if not Env.current.is_appmap_repo and Env.current.enables("unittest"):
+    logger.debug("Test recording is enabled (unittest)")
+    import _appmap.unittest  # pyright: ignore pylint: disable=unused-import

{appmap-1.15.2 → appmap-1.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "appmap"
-version = "1.15.2"
+version = "1.16.0"
 description = "Create AppMap files by recording a Python application."
 readme = "README.md"
 authors = [
@@ -22,10 +22,10 @@ classifiers = [
         'Topic :: Software Development :: Documentation'
 ]
 include = ['appmap.pth']
+exclude = ['_appmap/wrapt']
 
 packages = [
-    { include = "appmap"}, {include = "_appmap" },
-    { include = "appmap/wrapt/*.py", from="vendor/wrapt/src" }
+    { include = "appmap"}, {include = "_appmap" }, {include = "_appmap/wrapt", from = "vendor"}
 ]
 
 [tool.poetry.dependencies]
@@ -36,7 +36,7 @@ PyYAML = ">=5.3.0"
 inflection = ">=0.3.0"
 importlib-metadata = ">=0.8"
 importlib-resources = "^5.4.0"
-packaging = ">=21.3"
+packaging = ">=19.0"
 # If you include "Django" as an optional dependency here, you'll be able to use poetry to install it
 # in your dev environment. However, doing so causes poetry v1.2.0 to remove it from the virtualenv
 # *created and managed by tox*, i.e. not your dev environment. 
@@ -87,7 +87,7 @@ line-length = 100
 extend-exclude = '''
 /(
   | vendor
-  | appmap/wrapt
+  | _appmap/wrapt
 )/
 '''
 
@@ -95,6 +95,18 @@ extend-exclude = '''
 profile = "black"
 extend_skip = [
   "vendor",
-  "appmap/wrapt"
+  "_appmap/wrapt"
   ]
 
+[tool.vendoring]
+destination = "vendor/_appmap/"
+requirements = "vendor/vendor.txt"
+namespace = ""
+
+protected-files = ["vendor.txt"]
+patches-dir = "vendor/patches"
+
+[tool.vendoring.transformations]
+drop = [
+    "**/*.so",
+]

appmap-1.16.0/vendor/_appmap/wrapt/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2013-2023, Graham Dumpleton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

{appmap-1.15.2/vendor/wrapt/src/appmap → appmap-1.16.0/vendor/_appmap}/wrapt/__init__.py

@@ -1,4 +1,4 @@
-__version_info__ = ('1', '12', '1')
+__version_info__ = ('1', '15', '0')
 __version__ = '.'.join(__version_info__)
 
 from .wrappers import (ObjectProxy, CallableObjectProxy, FunctionWrapper,
@@ -13,4 +13,15 @@ from .decorators import (adapter_factory, AdapterFactory, decorator,
 from .importer import (register_post_import_hook, when_imported,
         notify_module_loaded, discover_post_import_hooks)
 
+# Import of inspect.getcallargs() included for backward compatibility. An
+# implementation of this was previously bundled and made available here for
+# Python <2.7. Avoid using this in future.
+
 from inspect import getcallargs
+
+# Variant of inspect.formatargspec() included here for forward compatibility.
+# This is being done because Python 3.11 dropped inspect.formatargspec() but
+# code for handling signature changing decorators relied on it. Exposing the
+# bundled implementation here in case any user of wrapt was also needing it.
+
+from .arguments import formatargspec

appmap-1.16.0/vendor/_appmap/wrapt/arguments.py

@@ -0,0 +1,38 @@
+# The inspect.formatargspec() function was dropped in Python 3.11 but we need
+# need it for when constructing signature changing decorators based on result of
+# inspect.getargspec() or inspect.getfullargspec(). The code here implements
+# inspect.formatargspec() base on Parameter and Signature from inspect module,
+# which were added in Python 3.6. Thanks to Cyril Jouve for the implementation.
+
+try:
+    from inspect import Parameter, Signature
+except ImportError:
+    from inspect import formatargspec
+else:
+    def formatargspec(args, varargs=None, varkw=None, defaults=None,
+                      kwonlyargs=(), kwonlydefaults={}, annotations={}):
+        if kwonlydefaults is None:
+            kwonlydefaults = {}
+        ndefaults = len(defaults) if defaults else 0
+        parameters = [
+            Parameter(
+                arg,
+                Parameter.POSITIONAL_OR_KEYWORD,
+                default=defaults[i] if i >= 0 else Parameter.empty,
+                annotation=annotations.get(arg, Parameter.empty),
+            ) for i, arg in enumerate(args, ndefaults - len(args))
+        ]
+        if varargs:
+            parameters.append(Parameter(varargs, Parameter.VAR_POSITIONAL))
+        parameters.extend(
+            Parameter(
+                kwonlyarg,
+                Parameter.KEYWORD_ONLY,
+                default=kwonlydefaults.get(kwonlyarg, Parameter.empty),
+                annotation=annotations.get(kwonlyarg, Parameter.empty),
+            ) for kwonlyarg in kwonlyargs
+        )
+        if varkw:
+            parameters.append(Parameter(varkw, Parameter.VAR_KEYWORD))
+        return_annotation = annotations.get('return', Signature.empty)
+        return str(Signature(parameters, return_annotation=return_annotation))

{appmap-1.15.2/vendor/wrapt/src/appmap → appmap-1.16.0/vendor/_appmap}/wrapt/decorators.py

@@ -31,10 +31,11 @@ else:
     del builtins
 
 from functools import partial
-from inspect import ismethod, isclass, formatargspec
-from collections import namedtuple
+from inspect import isclass
 from threading import Lock, RLock
 
+from .arguments import formatargspec
+
 try:
     from inspect import signature
 except ImportError:
@@ -173,7 +174,7 @@ adapter_factory = DelegatedAdapterFactory
 # function so the wrapper is effectively indistinguishable from the
 # original wrapped function.
 
-def decorator(wrapper=None, enabled=None, adapter=None):
+def decorator(wrapper=None, enabled=None, adapter=None, proxy=FunctionWrapper):
     # The decorator should be supplied with a single positional argument
     # which is the wrapper function to be used to implement the
     # decorator. This may be preceded by a step whereby the keyword
@@ -183,7 +184,7 @@ 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() and similar
+    # argument specification from inspect.getfullargspec() 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
@@ -194,6 +195,8 @@ def decorator(wrapper=None, enabled=None, adapter=None):
     # 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.
+    # The 'proxy' argument provides a way of passing a custom version of
+    # the FunctionWrapper class used in decorating the function.
 
     if wrapper is not None:
         # Helper function for creating wrapper of the appropriate
@@ -206,16 +209,37 @@ def decorator(wrapper=None, enabled=None, adapter=None):
 
                 if not callable(adapter):
                     ns = {}
+
+                    # Check if the signature argument specification has
+                    # annotations. If it does then we need to remember
+                    # it but also drop it when attempting to manufacture
+                    # a standin adapter function. This is necessary else
+                    # it will try and look up any types referenced in
+                    # the annotations in the empty namespace we use,
+                    # which will fail.
+
+                    annotations = {}
+
                     if not isinstance(adapter, string_types):
+                        if len(adapter) == 7:
+                            annotations = adapter[-1]
+                            adapter = adapter[:-1]
                         adapter = formatargspec(*adapter)
+
                     exec_('def adapter{}: pass'.format(adapter), ns, ns)
                     adapter = ns['adapter']
 
+                    # Override the annotations for the manufactured
+                    # adapter function so they match the original
+                    # adapter signature argument specification.
+
+                    if annotations:
+                        adapter.__annotations__ = annotations
+
                 return AdapterWrapper(wrapped=wrapped, wrapper=wrapper,
                         enabled=enabled, adapter=adapter)
 
-            return FunctionWrapper(wrapped=wrapped, wrapper=wrapper,
-                    enabled=enabled)
+            return proxy(wrapped=wrapped, wrapper=wrapper, enabled=enabled)
 
         # The wrapper has been provided so return the final decorator.
         # The decorator is itself one of our function wrappers so we
@@ -360,7 +384,7 @@ def decorator(wrapper=None, enabled=None, adapter=None):
                     # This one is a bit strange because binding was actually
                     # performed on the wrapper created by our decorator
                     # factory. We need to apply that binding to the decorator
-                    # wrapper function which which the decorator factory
+                    # wrapper function that the decorator factory
                     # was applied to.
 
                     target_wrapper = wrapper.__get__(None, instance)
@@ -384,7 +408,7 @@ def decorator(wrapper=None, enabled=None, adapter=None):
                     # This one is a bit strange because binding was actually
                     # performed on the wrapper created by our decorator
                     # factory. We need to apply that binding to the decorator
-                    # wrapper function which which the decorator factory
+                    # wrapper function that the decorator factory
                     # was applied to.
 
                     target_wrapper = wrapper.__get__(instance, type(instance))
@@ -408,7 +432,8 @@ def decorator(wrapper=None, enabled=None, adapter=None):
         # decorator again wrapped in a partial using the collected
         # arguments.
 
-        return partial(decorator, enabled=enabled, adapter=adapter)
+        return partial(decorator, enabled=enabled, adapter=adapter,
+                proxy=proxy)
 
 # Decorator for implementing thread synchronization. It can be used as a
 # decorator, in which case the synchronization context is determined by