Ticket #12488: email_url_inputs.diff

django/forms/fields.py

@@ -21 +21 @@
 from django.utils.formats import get_format
 
 from util import ErrorList, ValidationError
-from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput, SplitDateTimeWidget, SplitHiddenDateTimeWidget
+from widgets import TextInput, PasswordInput, EmailInput, URLInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateInput, DateTimeInput, TimeInput, SplitDateTimeWidget, SplitHiddenDateTimeWidget
 
 __all__ = (
     'Field', 'CharField', 'IntegerField',
@@ -410 +410 @@
     r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE)  # domain
 
 class EmailField(RegexField):
+    widget = EmailInput
     default_error_messages = {
         'invalid': _(u'Enter a valid e-mail address.'),
     }
@@ -525 +526 @@
     r'(?:/?|/\S+)$', re.IGNORECASE)
 
 class URLField(RegexField):
+    widget = URLInput
     default_error_messages = {
         'invalid': _(u'Enter a valid URL.'),
         'invalid_link': _(u'This URL appears to be a broken link.'),

django/forms/widgets.py

@@ -16 +16 @@
 from urlparse import urljoin
 
 __all__ = (
-    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput',
+    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput', 'EmailInput', 'URLInput',
     'HiddenInput', 'MultipleHiddenInput',
     'FileInput', 'DateInput', 'DateTimeInput', 'TimeInput', 'Textarea', 'CheckboxInput',
     'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
@@ -225 +225 @@
         if not self.render_value: value=None
         return super(PasswordInput, self).render(name, value, attrs)
 
+class EmailInput(Input):
+    input_type = 'email'
+
+class URLInput(Input):
+    input_type = 'url'
+
 class HiddenInput(Input):
     input_type = 'hidden'
     is_hidden = True