Fixed #6967: `ModelForm`s now validate choices. Thanks, mattmcc -- the failing...

        "Returns a django.forms.Field instance for this database Field."

        defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text}

        if self.choices:

            defaults['widget'] = forms.Select(choices=self.get_choices(include_blank=self.blank or not (self.has_default() or 'initial' in kwargs)))

            form_class = forms.TypedChoiceField

            include_blank = self.blank or not (self.has_default() or 'initial' in kwargs)

            defaults['choices'] = self.get_choices(include_blank=include_blank)

            defaults['coerce'] = self.to_python

            if self.null:

                defaults['empty_value'] = None

            kwargs.pop('max_length', None)

        if self.has_default():

            defaults['initial'] = self.get_default()

        defaults.update(kwargs)

    (3, 'Live'),

)

ARTICLE_STATUS_CHAR = (

    ('d', 'Draft'),

    ('p', 'Pending'),

    ('l', 'Live'),

)

class Category(models.Model):

    name = models.CharField(max_length=20)

    slug = models.SlugField(max_length=20)

    def __unicode__(self):

        return self.field

class ArticleStatus(models.Model):

    status = models.CharField(max_length=2, choices=ARTICLE_STATUS_CHAR, blank=True, null=True)

__test__ = {'API_TESTS': """

>>> from django import forms

>>> from django.forms.models import ModelForm, model_to_dict

>>> f.clean('1')

u'1'

# Choices on CharField and IntegerField

>>> class ArticleForm(ModelForm):

...     class Meta:

...         model = Article

>>> f = ArticleForm()

>>> f.fields['status'].clean('42')

Traceback (most recent call last):

...

ValidationError: [u'Select a valid choice. 42 is not one of the available choices.']

>>> class ArticleStatusForm(ModelForm):

...     class Meta:

...         model = ArticleStatus

>>> f = ArticleStatusForm()

>>> f.fields['status'].clean('z')

Traceback (most recent call last):

...

ValidationError: [u'Select a valid choice. z is not one of the available choices.']

"""}