p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #15754 -- avoid recursively computing the tree of media widgets more times than is necessary for a wiget

This commit is contained in:
Alex Gaynor 2012-08-06 07:58:54 -07:00 committed by Alex Gaynor
parent ad237fb72f
commit ede49c7ee0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/forms/widgets.py
View File

@ -110,9 +110,10 @@ class Media(StrAndUnicode):
def media_property(cls): def media_property(cls):
def _media(self): def _media(self):
# Get the media property of the superclass, if it exists # Get the media property of the superclass, if it exists
if hasattr(super(cls, self), 'media'): sup_cls = super(cls, self)
base = super(cls, self).media try:
else: base = sup_cls.media
except AttributeError:
base = Media() base = Media()
# Get the media definition for this class # Get the media definition for this class