Ticket #15754: widgets.diff

forms/widgets.py

@@ -97 +97 @@
 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:
-            base = Media()
+        base = getattr(super(cls, self), 'media', None) or Media()
 
         # Get the media definition for this class
         definition = getattr(cls, 'Media', None)