More shit

cool-RR · cool-RR · commit bf85c5cbde34 · 2019-07-18T19:11:13.000+03:00
diff --git a/docs/topics/cute-inspect.txt b/docs/topics/cute-inspect.txt
diff --git a/python_toolbox/caching/cached_property.py b/python_toolbox/caching/cached_property.py
@@ -7,8 +7,8 @@
 See its documentation for more details.
 '''
 
-from python_toolbox import decorator_tools
 from python_toolbox import misc_tools
+from python_toolbox.third_party.decorator import decorator
 
 
 class CachedProperty(misc_tools.OwnNameDiscoveringDescriptor):
@@ -73,7 +73,7 @@ def __call__(self, method_function):
         def inner(same_method_function, self_obj, *args, **kwargs):
             with getattr(self_obj, self.get_our_name(self_obj)):
                 return method_function(self_obj, *args, **kwargs)
-        return decorator_tools.decorator(inner, method_function)
+        return decorator(inner, method_function)
 
 
     def __repr__(self):
diff --git a/python_toolbox/caching/decorators.py b/python_toolbox/caching/decorators.py
@@ -14,6 +14,7 @@
 from python_toolbox import binary_search
 from python_toolbox import decorator_tools
 from python_toolbox.sleek_reffing import SleekCallArgs
+from python_toolbox.third_party.decorator import decorator as decorator_
 
 infinity = float('inf')
 
@@ -158,7 +159,7 @@ def cached(function, *args, **kwargs):
                     return value
 
 
-        result = decorator_tools.decorator(cached, function)
+        result = decorator_(cached, function)
 
         def cache_clear(key=CLEAR_ENTIRE_CACHE):
             if key is CLEAR_ENTIRE_CACHE:
diff --git a/python_toolbox/context_management/mixins/decorating_context_manager_mixin.py b/python_toolbox/context_management/mixins/decorating_context_manager_mixin.py
@@ -1,7 +1,7 @@
 # Copyright 2009-2017 Ram Rachum.
 # This program is distributed under the MIT license.
 
-from python_toolbox import decorator_tools
+from python_toolbox.third_party.decorator import decorator
 
 
 class _DecoratingContextManagerMixin:
@@ -24,4 +24,4 @@ def __call__(self, function):
         def inner(function_, *args, **kwargs):
             with self:
                 return function_(*args, **kwargs)
-        return decorator_tools.decorator(inner, function)
+        return decorator(inner, function)
diff --git a/python_toolbox/cute_inspect/__init__.py b/python_toolbox/cute_inspect/__init__.py
diff --git a/python_toolbox/cute_profile/cute_profile.py b/python_toolbox/cute_profile/cute_profile.py
@@ -11,7 +11,7 @@
 import marshal
 
 from python_toolbox import misc_tools
-from python_toolbox import decorator_tools
+from python_toolbox.third_party.decorator import decorator
 
 from . import base_profile
 from . import profile_handling
@@ -120,7 +120,7 @@ def inner(function_, *args, **kwargs):
 
                 return decorated_function.original_function(*args, **kwargs)
 
-        decorated_function = decorator_tools.decorator(inner, function)
+        decorated_function = decorator(inner, function)
 
         decorated_function.original_function = function
         decorated_function.profiling_on = None
diff --git a/python_toolbox/cute_testing.py b/python_toolbox/cute_testing.py
@@ -5,10 +5,10 @@
 
 import nose
 import sys
+import inspect
 
 from python_toolbox.third_party import unittest2
 
-from python_toolbox import cute_inspect
 from python_toolbox import context_management
 from python_toolbox.exceptions import CuteException
 from python_toolbox import logic_tools
@@ -109,7 +109,7 @@ def manage_context(self):
 
 def assert_same_signature(*callables):
     '''Assert that all the `callables` have the same function signature.'''
-    arg_specs = [cute_inspect.getargspec(callable_) for callable_ in callables]
+    arg_specs = [inspect.getfullargspec(callable_) for callable_ in callables]
     if not logic_tools.all_equivalent(arg_specs, assume_transitive=False):
         raise Failure('Not all the callables have the same signature.')
 
diff --git a/python_toolbox/decorator_tools.py b/python_toolbox/decorator_tools.py
@@ -9,36 +9,6 @@
 
 from python_toolbox.third_party import decorator as michele_decorator_module
 
-def decorator(caller, func=None):
-    '''
-    Create a decorator.
-
-    `decorator(caller)` converts a caller function into a decorator;
-    `decorator(caller, func)` decorates a function using a caller.
-    '''
-    if func is not None: # returns a decorated function
-        evaldict = func.__globals__.copy()
-        evaldict['_call_'] = caller
-        evaldict['_func_'] = func
-        result = michele_decorator_module.FunctionMaker.create(
-            func, "return _call_(_func_, %(shortsignature)s)",
-            evaldict, undecorated=func)
-        result.__wrapped__ = func
-        return result
-    else: # returns a decorator
-        if isinstance(caller, functools.partial):
-            return functools.partial(decorator, caller)
-        # otherwise assume caller is a function
-        first = inspect.getargspec(caller)[0][0] # first arg
-        evaldict = caller.__globals__.copy()
-        evaldict['_call_'] = caller
-        evaldict['decorator'] = decorator
-        return michele_decorator_module.FunctionMaker.create(
-            '%s(%s)' % (caller.__name__, first),
-            'return decorator(_call_, %s)' % first,
-            evaldict, undecorated=caller,
-            doc=caller.__doc__, module=caller.__module__)
-
 
 def helpful_decorator_builder(decorator_builder):
     '''
@@ -89,4 +59,4 @@ def inner(same_decorator_builder, *args, **kwargs):
         else:
             return decorator_builder(*args, **kwargs)
 
-    return decorator(inner, decorator_builder)
+    return functools.wraps(inner)(decorator_builder)
diff --git a/python_toolbox/introspection_tools.py b/python_toolbox/introspection_tools.py
@@ -3,7 +3,7 @@
 
 '''Defines various introspection tools, similar to the stdlib's `inspect`.'''
 
-from python_toolbox import cute_inspect
+import inspect
 
 from python_toolbox.nifty_collections import OrderedDict
 
@@ -19,7 +19,7 @@ def get_default_args_dict(function):
         OrderedDict([('c', 1), ('d', 'meow')])
 
     '''
-    arg_spec = cute_inspect.getargspec(function)
+    arg_spec = inspect.getfullargspec(function)
     (s_args, s_star_args, s_star_kwargs, s_defaults) = arg_spec
 
     # `getargspec` has a weird policy, when inspecting a function with no
diff --git a/python_toolbox/monkeypatching_tools.py b/python_toolbox/monkeypatching_tools.py
@@ -105,7 +105,7 @@ def change_defaults(function=None, new_defaults={}):
     be changed.
     '''
     def change_defaults_(function_, new_defaults_):
-        signature = inspect.Signature.from_function(function_)
+        signature = inspect.Signature.from_callable(function_)
         defaults = list(function_.__defaults__ or ())
         kwdefaults = function_.__kwdefaults__ or {}
         defaultful_parameters = dict_tools.filter_items(
diff --git a/python_toolbox/nifty_collections/bagging.py b/python_toolbox/nifty_collections/bagging.py
@@ -11,6 +11,7 @@
 
 from python_toolbox import misc_tools
 from python_toolbox import math_tools
+from python_toolbox.third_party.decorator import decorator
 
 from .lazy_tuple import LazyTuple
 from .ordered_dict import OrderedDict
@@ -124,11 +125,10 @@ def __call__(self, method_function):
         '''
         Decorate method to use value of `CachedProperty` as a context manager.
         '''
-        from python_toolbox import decorator_tools
         def inner(same_method_function, self_obj, *args, **kwargs):
             with getattr(self_obj, self.get_our_name(self_obj)):
                 return method_function(self_obj, *args, **kwargs)
-        return decorator_tools.decorator(inner, method_function)
+        return decorator(inner, method_function)
 
 
     def __repr__(self):
diff --git a/python_toolbox/nifty_collections/lazy_tuple.py b/python_toolbox/nifty_collections/lazy_tuple.py
@@ -9,6 +9,7 @@
 from python_toolbox import misc_tools
 from python_toolbox import decorator_tools
 from python_toolbox import comparison_tools
+from python_toolbox.third_party.decorator import decorator
 
 
 infinity = float('inf')
@@ -36,7 +37,7 @@ def _convert_index_to_exhaustion_point(index):
         return infinity
 
 
-@decorator_tools.decorator
+@decorator
 def _with_lock(method, *args, **kwargs):
     '''Decorator for using the `LazyTuple`'s lock.'''
     self = args[0]
@@ -118,7 +119,7 @@ def my_generator():
         def inner(function, *args, **kwargs):
             return cls(function(*args, **kwargs),
                        definitely_infinite=definitely_infinite)
-        return decorator_tools.decorator(inner)
+        return decorator(inner)
 
 
     @property
diff --git a/python_toolbox/sleek_reffing/sleek_call_args.py b/python_toolbox/sleek_reffing/sleek_call_args.py
@@ -7,7 +7,8 @@
 See its documentation for more details.
 '''
 
-from python_toolbox import cute_inspect
+import inspect
+
 from python_toolbox import cheat_hashing
 
 from .sleek_ref import SleekRef
@@ -50,11 +51,11 @@ def __init__(self, containing_dict, function, *args, **kwargs):
         `dict` we'll try to remove ourselves from when 1 of our sleekrefs dies.
         '''
 
-        args_spec = cute_inspect.getargspec(function)
+        args_spec = inspect.getfullargspec(function)
         star_args_name, star_kwargs_name = \
                       args_spec.varargs, args_spec.keywords
 
-        call_args = cute_inspect.getcallargs(function, *args, **kwargs)
+        call_args = inspect.getfullargspec(function, *args, **kwargs)
         del args, kwargs
 
         self.star_args_refs = []
diff --git a/python_toolbox/sleek_reffing/sleek_ref.py b/python_toolbox/sleek_reffing/sleek_ref.py
@@ -9,8 +9,6 @@
 
 import weakref
 
-from python_toolbox import cute_inspect
-
 from .exceptions import SleekRefDied
 
 
diff --git a/python_toolbox/third_party/decorator.py b/python_toolbox/third_party/decorator.py
diff --git a/python_toolbox/tracing_tools/count_calls.py b/python_toolbox/tracing_tools/count_calls.py
diff --git a/test_python_toolbox/test_monkeypatching_tools/test_monkeypatch.py b/test_python_toolbox/test_monkeypatching_tools/test_monkeypatch.py
