Django

Code

Changeset 4235

Show
Ignore:
Timestamp:
12/23/06 21:36:49 (2 years ago)
Author:
adrian
Message:

newforms: Removed Widget.requires_data_list parameter, which was made redundant by Widget.value_from_datadict()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/newforms/forms.py

    r4219 r4235  
    235235    def _data(self): 
    236236        "Returns the data for this BoundField, or None if it wasn't given." 
    237         if self.field.widget.requires_data_list and isinstance(self.form.data, MultiValueDict): 
    238             return self.form.data.getlist(self.html_name) 
    239         return self.form.data.get(self.html_name, None) 
     237        return self.field.widget.value_from_datadict(self.form.data, self.html_name) 
    240238    data = property(_data) 
    241239 

  • django/trunk/django/newforms/widgets.py

    r4196 r4235  
    2424 
    2525class Widget(object): 
    26     requires_data_list = False # Determines whether render()'s 'value' argument should be a list. 
    2726    is_hidden = False          # Determines whether this corresponds to an <input type="hidden">. 
    2827 
    …… 
    3029        self.attrs = attrs or {} 
    3130 
    32     def render(self, name, value): 
     31    def render(self, name, value, attrs=None): 
     32        """ 
     33        Returns this Widget rendered as HTML, as a Unicode string. 
     34 
     35        The 'value' given is not guaranteed to be valid input, so subclass 
     36        implementations should program defensively. 
     37        """ 
    3338        raise NotImplementedError 
    3439 
    …… 
    131136 
    132137class SelectMultiple(Widget): 
    133     requires_data_list = True 
    134138    def __init__(self, attrs=None, choices=()): 
    135139        # choices can be any iterable