diff options
| author | xuxiang <dlutxx@gmail.com> | 2013-11-20 10:02:30 +0800 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2013-11-19 23:08:21 -0500 |
| commit | 4cfe6ba6a3d16a16f0561f2f3c5b56d117f8a60d (patch) | |
| tree | 4032334140f2c73906e9b72a527aea626397dda5 /django/utils | |
| parent | 73b3c257e339985f2ab009c3ccf9a74be9e1d134 (diff) | |
Use `classmethod` as a decorator.
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/functional.py | 4 | ||||
| -rw-r--r-- | django/utils/tree.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py index bb04573587..52be83ce43 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -93,6 +93,7 @@ def lazy(func, *resultclasses): (func, self.__args, self.__kw) + resultclasses ) + @classmethod def __prepare_class__(cls): cls.__dispatch = {} for resultclass in resultclasses: @@ -119,8 +120,8 @@ def lazy(func, *resultclasses): cls.__bytes__ = cls.__bytes_cast else: cls.__str__ = cls.__bytes_cast - __prepare_class__ = classmethod(__prepare_class__) + @classmethod def __promise__(cls, klass, funcname, method): # Builds a wrapper around some magic method and registers that # magic method for the given type and method name. @@ -137,7 +138,6 @@ def lazy(func, *resultclasses): cls.__dispatch[klass] = {} cls.__dispatch[klass][funcname] = method return __wrapper__ - __promise__ = classmethod(__promise__) def __text_cast(self): return func(*self.__args, **self.__kw) diff --git a/django/utils/tree.py b/django/utils/tree.py index 381dcdd06c..16389d0507 100644 --- a/django/utils/tree.py +++ b/django/utils/tree.py @@ -27,6 +27,7 @@ class Node(object): # We need this because of django.db.models.query_utils.Q. Q. __init__() is # problematic, but it is a natural Node subclass in all other respects. + @classmethod def _new_instance(cls, children=None, connector=None, negated=False): """ This is called to create a new instance of this class when we need new @@ -39,7 +40,6 @@ class Node(object): obj = Node(children, connector, negated) obj.__class__ = cls return obj - _new_instance = classmethod(_new_instance) def __str__(self): if self.negated: |