diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-03-12 14:45:56 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-03-12 14:45:56 +0000 |
| commit | d1b889ec98f831b8a8143f9522da522c5ef0a3f6 (patch) | |
| tree | 9ce284d4c699f1364797f70c3bb87b036c270861 /django | |
| parent | 1e1b57bfbe3a493d2179d499f00b0bbba49b8e2d (diff) | |
[1.1.X] Fixed #11891 -- Ensured that attributes of get_absolute_url are preserved through the metaclass. Thanks to nfg for the report and patch.
Backport of r12766 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index 244ed613b7..c8ec6d0c8c 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -18,7 +18,7 @@ from django.db import connection, transaction, DatabaseError from django.db.models import signals from django.db.models.loading import register_models, get_model import django.utils.copycompat as copy -from django.utils.functional import curry +from django.utils.functional import curry, update_wrapper from django.utils.encoding import smart_str, force_unicode, smart_unicode from django.conf import settings @@ -236,7 +236,8 @@ class ModelBase(type): cls.__doc__ = "%s(%s)" % (cls.__name__, ", ".join([f.attname for f in opts.fields])) if hasattr(cls, 'get_absolute_url'): - cls.get_absolute_url = curry(get_absolute_url, opts, cls.get_absolute_url) + cls.get_absolute_url = update_wrapper(curry(get_absolute_url, opts, cls.get_absolute_url), + cls.get_absolute_url) signals.class_prepared.send(sender=cls) |
