Fixed #15754 -- avoid recursively computing the tree of media widgets…

… more times than is necessary for a wiget
django · Aug 6, 2012 · ede49c7 · ede49c7
1 parent ad237fb
commit ede49c7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
@@ -110,9 +110,10 @@ def __add__(self, other):
 def media_property(cls):
     def _media(self):
         # Get the media property of the superclass, if it exists
-        if hasattr(super(cls, self), 'media'):
-            base = super(cls, self).media
-        else:
+        sup_cls = super(cls, self)
+        try:
+            base = sup_cls.media
+        except AttributeError:
             base = Media()
 
         # Get the media definition for this class