Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/backends/mysql/base.py
	django/db/backends/postgresql_psycopg2/base.py

2 files changed, 22 insertions, 0 deletions

diff --git a/tests/regressiontests/model_permalink/models.py b/tests/regressiontests/model_permalink/models.py
index 4823fd46c7..dacf2a3fb3 100644
--- a/tests/regressiontests/model_permalink/models.py
+++ b/tests/regressiontests/model_permalink/models.py
@@ -1,6 +1,13 @@
 from django.db import models
 
 
+def set_attr(name, value):
+    def wrapper(function):
+        setattr(function, name, value)
+        return function
+    return wrapper
+
+
 class Guitarist(models.Model):
     name = models.CharField(max_length=50)
     slug = models.CharField(max_length=50)
@@ -9,3 +16,9 @@ class Guitarist(models.Model):
     def url(self):
         "Returns the URL for this guitarist."
         return ('guitarist_detail', [self.slug])
+
+    @models.permalink
+    @set_attr('attribute', 'value')
+    def url_with_attribute(self):
+        "Returns the URL for this guitarist and holds an attribute"
+        return ('guitarist_detail', [self.slug])
diff --git a/tests/regressiontests/model_permalink/tests.py b/tests/regressiontests/model_permalink/tests.py
index 8286f6811a..049f338c2e 100644
--- a/tests/regressiontests/model_permalink/tests.py
+++ b/tests/regressiontests/model_permalink/tests.py
@@ -16,3 +16,12 @@ class PermalinkTests(TestCase):
         "Methods using the @permalink decorator retain their docstring."
         g = Guitarist(name='Adrien Moignard', slug='adrienmoignard')
         self.assertEqual(g.url.__doc__, "Returns the URL for this guitarist.")
+
+    def test_wrapped_attribute(self):
+        """
+        Methods using the @permalink decorator can have attached attributes
+        from other decorators
+        """
+        g = Guitarist(name='Adrien Moignard', slug='adrienmoignard')
+        self.assertTrue(hasattr(g.url_with_attribute, 'attribute'))
+        self.assertEqual(g.url_with_attribute.attribute, 'value')