diff --git a/src/wrapt/__init__.py b/src/wrapt/__init__.py index f935330..d27ca92 100644 --- a/src/wrapt/__init__.py +++ b/src/wrapt/__init__.py @@ -1,7 +1,7 @@ __version_info__ = ('1', '16', '0rc2') __version__ = '.'.join(__version_info__) -from .variants import (ObjectProxy, CallableObjectProxy, FunctionWrapper, +from .__wrapt__ import (ObjectProxy, CallableObjectProxy, FunctionWrapper, BoundFunctionWrapper, PartialCallableObjectProxy) from .patches import (resolve_path, apply_patch, wrap_object, wrap_object_attribute, diff --git a/src/wrapt/decorators.py b/src/wrapt/decorators.py index d6f6cca..c80a4bb 100644 --- a/src/wrapt/decorators.py +++ b/src/wrapt/decorators.py @@ -41,7 +41,7 @@ def exec_(_code_, _globs_=None, _locs_=None): except ImportError: pass -from .variants import (FunctionWrapper, BoundFunctionWrapper, ObjectProxy, +from .__wrapt__ import (FunctionWrapper, BoundFunctionWrapper, ObjectProxy, CallableObjectProxy) # Adapter wrapper for the wrapped function which will overlay certain diff --git a/src/wrapt/importer.py b/src/wrapt/importer.py index 690f44a..23fcbd2 100644 --- a/src/wrapt/importer.py +++ b/src/wrapt/importer.py @@ -15,7 +15,7 @@ string_types = str, from importlib.util import find_spec -from .variants import ObjectProxy +from .__wrapt__ import ObjectProxy # The dictionary registering any post import hooks to be triggered once # the target module has been imported. Once a module has been imported diff --git a/src/wrapt/patches.py b/src/wrapt/patches.py index 9dc912c..e22adf7 100644 --- a/src/wrapt/patches.py +++ b/src/wrapt/patches.py @@ -8,7 +8,7 @@ else: string_types = str, -from .variants import FunctionWrapper +from .__wrapt__ import FunctionWrapper # Helper functions for applying wrappers to existing functions. diff --git a/src/wrapt/weakrefs.py b/src/wrapt/weakrefs.py index 10beb0c..f931b60 100644 --- a/src/wrapt/weakrefs.py +++ b/src/wrapt/weakrefs.py @@ -1,7 +1,7 @@ import functools import weakref -from .variants import ObjectProxy, _FunctionWrapperBase +from .__wrapt__ import ObjectProxy, _FunctionWrapperBase # A weak function proxy. This will work on instance methods, class # methods, static methods and regular functions. Special treatment is