summaryrefslogtreecommitdiff
path: root/django/contrib/admin/helpers.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-08-26 03:06:22 +0300
committerTim Graham <timograham@gmail.com>2016-08-25 20:06:22 -0400
commita02b5848ae6025ad3ef12cf6646ffd3e82a66067 (patch)
treee42106ba668d13fda3fa0f1880e527027f3154c6 /django/contrib/admin/helpers.py
parentebdfd656b482ecb503c481bfba8579d40a1f1809 (diff)
Replaced property() usage with decorator in several places.
Diffstat (limited to 'django/contrib/admin/helpers.py')
-rw-r--r--django/contrib/admin/helpers.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/admin/helpers.py b/django/contrib/admin/helpers.py
index d5cf38e2ea..3396dc66ad 100644
--- a/django/contrib/admin/helpers.py
+++ b/django/contrib/admin/helpers.py
@@ -56,12 +56,12 @@ class AdminForm(object):
**options
)
- def _media(self):
+ @property
+ def media(self):
media = self.form.media
for fs in self:
media = media + fs.media
return media
- media = property(_media)
class Fieldset(object):
@@ -74,7 +74,8 @@ class Fieldset(object):
self.model_admin = model_admin
self.readonly_fields = readonly_fields
- def _media(self):
+ @property
+ def media(self):
if 'collapse' in self.classes:
extra = '' if settings.DEBUG else '.min'
js = [
@@ -84,7 +85,6 @@ class Fieldset(object):
]
return forms.Media(js=['admin/js/%s' % url for url in js])
return forms.Media()
- media = property(_media)
def __iter__(self):
for field in self.fields:
@@ -303,12 +303,12 @@ class InlineAdminFormSet(object):
}
})
- def _media(self):
+ @property
+ def media(self):
media = self.opts.media + self.formset.media
for fs in self:
media = media + fs.media
return media
- media = property(_media)
class InlineAdminForm(AdminForm):