Replace sage_wraps by decorator library

src/sage/graphs/tutte_polynomial.py

@@ -36,7 +36,7 @@
 from sage.misc.lazy_attribute import lazy_attribute
 from sage.misc.misc_c import prod
 from sage.rings.integer_ring import ZZ
-from sage.misc.decorators import sage_wraps
+from decorator import decorator
 
 ######################
 # Graph Modification #
@@ -482,8 +482,8 @@ def _cache_key(G):
     """
     return tuple(G.canonical_label().edges(labels=False, sort=True))
 
-
-def _cached(func):
+@decorator
+def _cached(func, G, *args, **kwds):
     """
     Wrapper used to cache results of the function `func`
 
@@ -497,17 +497,13 @@ def _cached(func):
         sage: tutte_polynomial(G)(1,1)  #indirect doctest
         2000
     """
-    @sage_wraps(func)
-    def wrapper(G, *args, **kwds):
-        cache = kwds.setdefault('cache', {})
-        key = _cache_key(G)
-        if key in cache:
-            return cache[key]
-        result = func(G, *args, **kwds)
-        cache[key] = result
-        return result
-    wrapper.original_func = func
-    return wrapper
+    cache = kwds.setdefault('cache', {})
+    key = _cache_key(G)
+    if key in cache:
+        return cache[key]
+    result = func(G, *args, **kwds)
+    cache[key] = result
+    return result
 
 ####################
 # Tutte Polynomial #

src/sage/interacts/library.py

@@ -36,6 +36,7 @@
 #*****************************************************************************
 
 from __future__ import absolute_import, division
+from decorator import decorater
 
 from sage.all import *
 x = SR.var('x')
@@ -57,7 +58,8 @@
     globals()[name] = obj
 
 
-def library_interact(f):
+@decorater
+def library_interact(f, *args, **kw):
     """
     This is a decorator for using interacts in the Sage library.
 
@@ -75,11 +77,8 @@ def library_interact(f):
         Interactive function <function f at ...> with 1 widget
           n: IntSlider(value=5, description=u'n', max=15, min=-5)
     """
-    @sage_wraps(f)
-    def library_wrapper():
-        # This will display the interact, no need to return anything
-        interact(f)
-    return library_wrapper
+    # This will display the interact, no need to return anything
+    interact(f)
 
 
 def html(obj):

src/sage/interfaces/magma.py

@@ -216,6 +216,7 @@
 
 import re
 import sys
+from decorator import decorater
 
 from sage.structure.parent import Parent
 from .expect import console, Expect, ExpectElement, ExpectFunction, FunctionElement
@@ -3002,10 +3003,11 @@ def __exit__(self, typ, value, tb):
         """
         self.magma.SetVerbose('Groebner', self.groebner_basis_verbose)
 
-
-def magma_gb_standard_options(func):
+@decorater
+def magma_gb_standard_options(func, *args, **kwds):
     """
     Decorator to force default options for Magma.
+    Execute function in ``MagmaGBDefaultContext``.
 
     EXAMPLES::
 
@@ -3015,13 +3017,6 @@ def magma_gb_standard_options(func):
         sage: "mself" in sage_getsource(J._groebner_basis_magma)
         True
     """
-    from sage.misc.decorators import sage_wraps
+    with MagmaGBDefaultContext():
+        return func(*args, **kwds)
 
-    @sage_wraps(func)
-    def wrapper(*args, **kwds):
-        """
-        Execute function in ``MagmaGBDefaultContext``.
-        """
-        with MagmaGBDefaultContext():
-            return func(*args, **kwds)
-    return wrapper

src/sage/interfaces/singular.py

@@ -325,6 +325,7 @@
 import sys
 import pexpect
 from time import sleep
+from decorator import decorater
 
 from .expect import Expect, ExpectElement, FunctionElement, ExpectFunction
 
@@ -1347,7 +1348,8 @@ def __init__(self, parent, type, value, is_name=False):
             2
         """
         RingElement.__init__(self, parent)
-        if parent is None: return
+        if parent is None:
+            return
         if not is_name:
             try:
                 self._name = parent._create(value, type)
@@ -2744,8 +2746,8 @@ def __exit__(self, typ, value, tb):
         except SingularError:
             pass
 
-
-def singular_gb_standard_options(func):
+@decorater
+def singular_gb_standard_options(func, *args, **kwds):
     r"""
     Decorator to force a reduced Singular groebner basis.
 
@@ -2777,9 +2779,5 @@ def singular_gb_standard_options(func):
        This decorator is used automatically internally so the user
        does not need to use it manually.
     """
-    from sage.misc.decorators import sage_wraps
-    @sage_wraps(func)
-    def wrapper(*args, **kwds):
-        with SingularGBDefaultContext():
-            return func(*args, **kwds)
-    return wrapper
+    with SingularGBDefaultContext():
+        return func(*args, **kwds)

src/sage/libs/giac/__init__.py

@@ -30,6 +30,8 @@
 #                  https://www.gnu.org/licenses/
 # *****************************************************************************
 
+from decorator import decorater
+
 from sage.structure.proof.all import polynomial as proof_polynomial
 from sage.rings.polynomial.multi_polynomial_sequence import PolynomialSequence
 from .giac import giacsettings, libgiac
@@ -84,9 +86,11 @@ def __exit__(self, typ, value, tb):
         giacsettings.threads = self.threads
 
 
-def local_giacsettings(func):
+@decorater
+def local_giacsettings(func, *args, **kwds):
     """
     Decorator to preserve Giac's proba_epsilon and threads settings.
+    Execute function in ``GiacSettingsDefaultContext``.
 
     EXAMPLES::
 
@@ -107,17 +111,8 @@ def local_giacsettings(func):
         (True, 2)
 
     """
-    from sage.misc.decorators import sage_wraps
-
-    @sage_wraps(func)
-    def wrapper(*args, **kwds):
-        """
-        Execute function in ``GiacSettingsDefaultContext``.
-        """
-        with GiacSettingsDefaultContext():
-            return func(*args, **kwds)
-
-    return wrapper
+    with GiacSettingsDefaultContext():
+        return func(*args, **kwds)
 
 
 @local_giacsettings

src/sage/libs/singular/standard_options.py

@@ -5,6 +5,7 @@
 
 - Martin Albrecht
 """
+from decorator import decorator
 
 class LibSingularGBDefaultContext:
     def __init__(self):
@@ -99,9 +100,11 @@ def __exit__(self, typ, value, tb):
         """
         self.libsingular_option_context.__exit__(typ,value,tb)
 
-def libsingular_gb_standard_options(func):
+@decorator
+def libsingular_gb_standard_options(func, *args, **kwds):
     """
     Decorator to force a reduced Singular groebner basis.
+    Execute function in ``LibSingularGBDefaultContext``.
 
     TESTS::
 
@@ -131,12 +134,5 @@ def libsingular_gb_standard_options(func):
        This decorator is used automatically internally so the user
        does not need to use it manually.
     """
-    from sage.misc.decorators import sage_wraps
-    @sage_wraps(func)
-    def wrapper(*args, **kwds):
-        """
-        Execute function in ``LibSingularGBDefaultContext``.
-        """
-        with LibSingularGBDefaultContext():
-            return func(*args, **kwds)
-    return wrapper
+    with LibSingularGBDefaultContext():
+        return func(*args, **kwds)

src/sage/misc/all.py

@@ -164,7 +164,7 @@
 
 from .explain_pickle import explain_pickle, unpickle_newobj, unpickle_global, unpickle_build, unpickle_instantiate, unpickle_persistent, unpickle_extension, unpickle_appends
 
-from .decorators import specialize, sage_wraps, infix_operator
+from .decorators import specialize, infix_operator
 
 from .unknown import Unknown, UnknownError
 

src/sage/misc/bindable_class.py

@@ -154,9 +154,6 @@ def __classget__(cls, instance, owner):
         if instance is None:
             return cls
         return BoundClass(cls, instance)
-        # We probably do not need to use sage_wraps, since
-        # sageinspect already supports partial functions
-        #return sage_wraps(cls)(BoundClass(cls, instance))
 
 class BoundClass(functools.partial):
     """

src/sage/misc/cachefunc.pyx

@@ -425,7 +425,7 @@ from sage.misc.sageinspect import sage_getfile, sage_getsourcelines, sage_getarg
 from inspect import isfunction
 
 from sage.misc.weak_dict cimport CachedWeakValueDictionary
-from sage.misc.decorators import decorator_keywords
+from decorator import decorator
 
 cdef frozenset special_method_names = frozenset(['__abs__', '__add__',
             '__and__', '__call__', '__cmp__', '__coerce__', '__complex__', '__contains__', '__del__',
@@ -1243,8 +1243,8 @@ cdef class CachedFunction(object):
         for ((args,kwargs), val) in P(arglist2):
             self.set_cache(val, *args, **kwargs)
 
-
-cached_function = decorator_keywords(CachedFunction)
+def cached_function(func):
+    return decorate(func, CachedFunction(func))
 
 
 cdef class WeakCachedFunction(CachedFunction):
@@ -1433,7 +1433,8 @@ cdef class WeakCachedFunction(CachedFunction):
         self.cache = CachedWeakValueDictionary(**kwds)
 
 
-weak_cached_function = decorator_keywords(WeakCachedFunction)
+def weak_cached_function(func):
+    return decorate(func, WeakCachedFunction(func))
 
 class CachedMethodPickle(object):
     """
@@ -2995,8 +2996,8 @@ cdef class CachedSpecialMethod(CachedMethod):
             D[name] = Caller
         return Caller
 
-@decorator_keywords
-def cached_method(f, name=None, key=None, do_pickle=None):
+@decorator
+def cached_method(f, name=None, key=None, do_pickle=None, *args, **kw):
     """
     A decorator for cached methods.
 
@@ -3090,9 +3091,8 @@ def cached_method(f, name=None, key=None, do_pickle=None):
     """
     cdef str fname = name or f.__name__
     if fname in special_method_names:
-        return CachedSpecialMethod(f, name, key=key, do_pickle=do_pickle)
-    return CachedMethod(f, name, key=key, do_pickle=do_pickle)
-
+        return CachedSpecialMethod(f, name, key=key, do_pickle=do_pickle)(*args, **kw)
+    return CachedMethod(f, name, key=key, do_pickle=do_pickle)(*args, **kw)
 
 cdef class CachedInParentMethod(CachedMethod):
     r"""
@@ -3304,8 +3304,8 @@ cdef class CachedInParentMethod(CachedMethod):
             pass
         return Caller
 
-
-cached_in_parent_method = decorator_keywords(CachedInParentMethod)
+def cached_in_parent_method(func):
+    return decorate(func, CachedInParentMethod(func))
 
 
 class FileCache(object):