summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-08-25 00:23:16 +0300
committerTim Graham <timograham@gmail.com>2016-08-24 17:23:16 -0400
commit3c97ba2a0d3a03e89b27a7a895562e5282018613 (patch)
tree90db45c261d298919d6a98eba9b7ed95cece3792
parenta3abbe1fcb10e9ed4502c22748eb825170f41f23 (diff)
Replaced property() usage with decorator in a couple places.
-rw-r--r--django/contrib/admin/options.py2
-rw-r--r--django/db/models/query.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 53801a981b..052a1d5a9a 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -560,9 +560,9 @@ class ModelAdmin(BaseModelAdmin):
]
return urlpatterns
+ @property
def urls(self):
return self.get_urls()
- urls = property(urls)
@property
def media(self):
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 7a2ef08ba2..f69c7754f4 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -993,6 +993,7 @@ class QuerySet(object):
# PUBLIC INTROSPECTION ATTRIBUTES #
###################################
+ @property
def ordered(self):
"""
Returns True if the QuerySet is ordered -- i.e. has an order_by()
@@ -1004,7 +1005,6 @@ class QuerySet(object):
return True
else:
return False
- ordered = property(ordered)
@property
def db(self):