summaryrefslogtreecommitdiff
path: root/django/db/models/base.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-03-12 14:36:39 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-03-12 14:36:39 +0000
commit203d0f60481657847b9084e6a008ae781381503a (patch)
tree40dfe8de99046d6cc68121078b2e4fdae5c38759 /django/db/models/base.py
parentef0be292a687f95f1081b2ff8170fd7cbd5a365f (diff)
Fixed #11891 -- Ensured that attributes of get_absolute_url are preserved through the metaclass. Thanks to nfg for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/base.py')
-rw-r--r--django/db/models/base.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index c330b6c085..807137fb57 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -15,7 +15,7 @@ from django.db.models import signals
from django.db.models.loading import register_models, get_model
from django.utils.translation import ugettext_lazy as _
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.utils.text import get_text_list, capfirst
from django.conf import settings
@@ -232,7 +232,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)