Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1314)

Unified Diff: third_party/logilab/common/decorators.py

Issue 719313003: Revert "pylint: upgrade to 1.3.1" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/logilab/common/debugger.py ('k') | third_party/logilab/common/deprecation.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/logilab/common/decorators.py
diff --git a/third_party/logilab/common/decorators.py b/third_party/logilab/common/decorators.py
index beafa202204393e8742607923ff3e66fa6338a8f..43c365212540e7e9e5ec62ab02b144d4abd0de70 100644
--- a/third_party/logilab/common/decorators.py
+++ b/third_party/logilab/common/decorators.py
@@ -1,4 +1,4 @@
-# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of logilab-common.
@@ -16,28 +16,26 @@
# You should have received a copy of the GNU Lesser General Public License along
# with logilab-common. If not, see <http://www.gnu.org/licenses/>.
""" A few useful function/method decorators. """
-
-from __future__ import print_function
-
__docformat__ = "restructuredtext en"
import sys
-import types
from time import clock, time
-from inspect import isgeneratorfunction, getargspec
-from logilab.common.compat import method_type
+from logilab.common.compat import callable, method_type
# XXX rewrite so we can use the decorator syntax when keyarg has to be specified
+def _is_generator_function(callableobj):
+ return callableobj.func_code.co_flags & 0x20
+
class cached_decorator(object):
def __init__(self, cacheattr=None, keyarg=None):
self.cacheattr = cacheattr
self.keyarg = keyarg
def __call__(self, callableobj=None):
- assert not isgeneratorfunction(callableobj), \
+ assert not _is_generator_function(callableobj), \
'cannot cache generator function: %s' % callableobj
- if len(getargspec(callableobj).args) == 1 or self.keyarg == 0:
+ if callableobj.func_code.co_argcount == 1 or self.keyarg == 0:
cache = _SingleValueCache(callableobj, self.cacheattr)
elif self.keyarg:
cache = _MultiValuesKeyArgCache(callableobj, self.keyarg, self.cacheattr)
@@ -69,6 +67,7 @@ class _SingleValueCache(object):
try:
wrapped.__doc__ = self.callable.__doc__
wrapped.__name__ = self.callable.__name__
+ wrapped.func_name = self.callable.func_name
except:
pass
return wrapped
@@ -227,8 +226,8 @@ def timed(f):
t = time()
c = clock()
res = f(*args, **kwargs)
- print('%s clock: %.9f / time: %.9f' % (f.__name__,
- clock() - c, time() - t))
+ print '%s clock: %.9f / time: %.9f' % (f.__name__,
+ clock() - c, time() - t)
return res
return wrap
@@ -250,9 +249,7 @@ def locked(acquire, release):
def monkeypatch(klass, methodname=None):
- """Decorator extending class with the decorated callable. This is basically
- a syntactic sugar vs class assignment.
-
+ """Decorator extending class with the decorated callable
>>> class A:
... pass
>>> @monkeypatch(A)
@@ -276,6 +273,11 @@ def monkeypatch(klass, methodname=None):
raise AttributeError('%s has no __name__ attribute: '
'you should provide an explicit `methodname`'
% func)
- setattr(klass, name, func)
+ if callable(func) and sys.version_info < (3, 0):
+ setattr(klass, name, method_type(func, None, klass))
+ else:
+ # likely a property
+ # this is quite borderline but usage already in the wild ...
+ setattr(klass, name, func)
return func
return decorator
« no previous file with comments | « third_party/logilab/common/debugger.py ('k') | third_party/logilab/common/deprecation.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698