newforms-admin: Merged to [5194]

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5195 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 9 insertions, 2 deletions

diff --git a/django/newforms/forms.py b/django/newforms/forms.py
index 2d7a65d7fe..42a06fd00d 100644
--- a/django/newforms/forms.py
+++ b/django/newforms/forms.py
@@ -122,7 +122,14 @@ class BaseForm(StrAndUnicode):
             else:
                 if errors_on_separate_row and bf_errors:
                     output.append(error_row % bf_errors)
-                label = bf.label and bf.label_tag(escape(bf.label + ':')) or ''
+                if bf.label:
+                    label = escape(bf.label)
+                    # Only add a colon if the label does not end in punctuation.
+                    if label[-1] not in ':?.!':
+                        label += ':'
+                    label = bf.label_tag(label) or ''
+                else:
+                    label = ''
                 if field.help_text:
                     help_text = help_text_html % field.help_text
                 else:
@@ -262,7 +269,7 @@ class BoundField(StrAndUnicode):
     def as_widget(self, widget, attrs=None):
         attrs = attrs or {}
         auto_id = self.auto_id
-        if auto_id and not attrs.has_key('id') and not widget.attrs.has_key('id'):
+        if auto_id and 'id' not in attrs and 'id' not in widget.attrs:
             attrs['id'] = auto_id
         if not self.form.is_bound:
             data = self.form.initial.get(self.name, self.field.initial)