boulder-oracle-sprint: Merged to [4077] of trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4083 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 74 insertions, 34 deletions

diff --git a/django/newforms/widgets.py b/django/newforms/widgets.py
index 5ec27653cf..318c76e55d 100644
--- a/django/newforms/widgets.py
+++ b/django/newforms/widgets.py
@@ -5,9 +5,10 @@ HTML Widget classes
 __all__ = (
     'Widget', 'TextInput', 'PasswordInput', 'HiddenInput', 'FileInput',
     'Textarea', 'CheckboxInput',
-    'Select', 'SelectMultiple',
+    'Select', 'SelectMultiple', 'RadioSelect',
 )
 
+from util import smart_unicode
 from django.utils.html import escape
 from itertools import chain
 
@@ -16,9 +17,9 @@ try:
 except NameError:
     from sets import Set as set # Python 2.3 fallback
 
-# Converts a dictionary to a single string with key="value", XML-style.
-# Assumes keys do not need to be XML-escaped.
-flatatt = lambda attrs: ' '.join(['%s="%s"' % (k, escape(v)) for k, v in attrs.items()])
+# Converts a dictionary to a single string with key="value", XML-style with
+# a leading space. Assumes keys do not need to be XML-escaped.
+flatatt = lambda attrs: u''.join([u' %s="%s"' % (k, escape(v)) for k, v in attrs.items()])
 
 class Widget(object):
     requires_data_list = False # Determines whether render()'s 'value' argument should be a list.
@@ -28,16 +29,23 @@ class Widget(object):
     def render(self, name, value):
         raise NotImplementedError
 
+    def build_attrs(self, extra_attrs=None, **kwargs):
+        attrs = dict(self.attrs, **kwargs)
+        if extra_attrs:
+            attrs.update(extra_attrs)
+        return attrs
+
 class Input(Widget):
-    "Base class for all <input> widgets (except type='checkbox', which is special)"
+    """
+    Base class for all <input> widgets (except type='checkbox' and
+    type='radio', which are special).
+    """
     input_type = None # Subclasses must define this.
     def render(self, name, value, attrs=None):
         if value is None: value = ''
-        final_attrs = dict(self.attrs, type=self.input_type, name=name)
-        if attrs:
-            final_attrs.update(attrs)
-        if value != '': final_attrs['value'] = value # Only add the 'value' attribute if a value is non-empty.
-        return u'<input %s />' % flatatt(final_attrs)
+        final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
+        if value != '': final_attrs['value'] = smart_unicode(value) # Only add the 'value' attribute if a value is non-empty.
+        return u'<input%s />' % flatatt(final_attrs)
 
 class TextInput(Input):
     input_type = 'text'
@@ -54,18 +62,15 @@ class FileInput(Input):
 class Textarea(Widget):
     def render(self, name, value, attrs=None):
         if value is None: value = ''
-        final_attrs = dict(self.attrs, name=name)
-        if attrs:
-            final_attrs.update(attrs)
-        return u'<textarea %s>%s</textarea>' % (flatatt(final_attrs), escape(value))
+        value = smart_unicode(value)
+        final_attrs = self.build_attrs(attrs, name=name)
+        return u'<textarea%s>%s</textarea>' % (flatatt(final_attrs), escape(value))
 
 class CheckboxInput(Widget):
     def render(self, name, value, attrs=None):
-        final_attrs = dict(self.attrs, type='checkbox', name=name)
-        if attrs:
-            final_attrs.update(attrs)
+        final_attrs = self.build_attrs(attrs, type='checkbox', name=name)
         if value: final_attrs['checked'] = 'checked'
-        return u'<input %s />' % flatatt(final_attrs)
+        return u'<input%s />' % flatatt(final_attrs)
 
 class Select(Widget):
     def __init__(self, attrs=None, choices=()):
@@ -75,14 +80,13 @@ class Select(Widget):
 
     def render(self, name, value, attrs=None, choices=()):
         if value is None: value = ''
-        final_attrs = dict(self.attrs, name=name)
-        if attrs:
-            final_attrs.update(attrs)
-        output = [u'<select %s>' % flatatt(final_attrs)]
-        str_value = str(value) # Normalize to string.
+        final_attrs = self.build_attrs(attrs, name=name)
+        output = [u'<select%s>' % flatatt(final_attrs)]
+        str_value = smart_unicode(value) # Normalize to string.
         for option_value, option_label in chain(self.choices, choices):
-            selected_html = (str(option_value) == str_value) and ' selected="selected"' or ''
-            output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(option_label)))
+            option_value = smart_unicode(option_value)
+            selected_html = (option_value == str_value) and u' selected="selected"' or ''
+            output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(smart_unicode(option_label))))
         output.append(u'</select>')
         return u'\n'.join(output)
 
@@ -95,19 +99,55 @@ class SelectMultiple(Widget):
 
     def render(self, name, value, attrs=None, choices=()):
         if value is None: value = []
-        final_attrs = dict(self.attrs, name=name)
-        if attrs:
-            final_attrs.update(attrs)
-        output = [u'<select multiple="multiple" %s>' % flatatt(final_attrs)]
-        str_values = set([str(v) for v in value]) # Normalize to strings.
+        final_attrs = self.build_attrs(attrs, name=name)
+        output = [u'<select multiple="multiple"%s>' % flatatt(final_attrs)]
+        str_values = set([smart_unicode(v) for v in value]) # Normalize to strings.
         for option_value, option_label in chain(self.choices, choices):
-            selected_html = (str(option_value) in str_values) and ' selected="selected"' or ''
-            output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(option_label)))
+            option_value = smart_unicode(option_value)
+            selected_html = (option_value in str_values) and ' selected="selected"' or ''
+            output.append(u'<option value="%s"%s>%s</option>' % (escape(option_value), selected_html, escape(smart_unicode(option_label))))
         output.append(u'</select>')
         return u'\n'.join(output)
 
-class RadioSelect(Widget):
-    pass
+class RadioInput(object):
+    "An object used by RadioFieldRenderer that represents a single <input type='radio'>."
+    def __init__(self, name, value, attrs, choice):
+        self.name, self.value = name, value
+        self.attrs = attrs or {}
+        self.choice_value, self.choice_label = choice
+
+    def __str__(self):
+        return u'<label>%s %s</label>' % (self.tag(), self.choice_label)
+
+    def is_checked(self):
+        return self.value == smart_unicode(self.choice_value)
+
+    def tag(self):
+        final_attrs = dict(self.attrs, type='radio', name=self.name, value=self.choice_value)
+        if self.is_checked():
+            final_attrs['checked'] = 'checked'
+        return u'<input%s />' % flatatt(final_attrs)
+
+class RadioFieldRenderer(object):
+    "An object used by RadioSelect to enable customization of radio widgets."
+    def __init__(self, name, value, attrs, choices):
+        self.name, self.value, self.attrs = name, value, attrs
+        self.choices = choices
+
+    def __iter__(self):
+        for choice in self.choices:
+            yield RadioInput(self.name, self.value, self.attrs, choice)
+
+    def __str__(self):
+        "Outputs a <ul> for this set of radio fields."
+        return u'<ul>\n%s\n</ul>' % u'\n'.join([u'<li>%s</li>' % w for w in self])
+
+class RadioSelect(Select):
+    def render(self, name, value, attrs=None, choices=()):
+        "Returns a RadioFieldRenderer instance rather than a Unicode string."
+        if value is None: value = ''
+        str_value = smart_unicode(value) # Normalize to string.
+        return RadioFieldRenderer(name, str_value, attrs, list(chain(self.choices, choices)))
 
 class CheckboxSelectMultiple(Widget):
     pass