Fixed #7947 -- Handle the display of OneToOneField in model forms correctly....

            formfield = db_field.formfield(**kwargs)

            # Don't wrap raw_id fields. Their add function is in the popup window.

            if not db_field.name in self.raw_id_fields:

                # formfield can be None if it came from a OneToOneField with

                # parent_link=True

                if formfield is not None:

                    formfield.widget = widgets.RelatedFieldWidgetWrapper(formfield.widget, db_field.rel, self.admin_site)

            return formfield

    """

    def __init__(self, to, to_field=None, **kwargs):

        kwargs['unique'] = True

        kwargs['editable'] = False

        if 'num_in_admin' not in kwargs:

            kwargs['num_in_admin'] = 0

        super(OneToOneField, self).__init__(to, to_field, OneToOneRel, **kwargs)

        if not cls._meta.one_to_one_field:

            cls._meta.one_to_one_field = self

    def formfield(self, **kwargs):

        if self.rel.parent_link:

            return None

        return super(OneToOneField, self).formfield(**kwargs)

class ManyToManyField(RelatedField, Field):

    def __init__(self, to, **kwargs):

        try:

    def __unicode__(self):

        return self.headline

class ImprovedArticle(models.Model):

    article = models.OneToOneField(Article)

class ImprovedArticleWithParentLink(models.Model):

    article = models.OneToOneField(Article, parent_link=True)

class PhoneNumber(models.Model):

    phone = models.PhoneNumberField()

    description = models.CharField(max_length=20)

>>> list(f.choices)

[(1L, 'multicategory Entertainment'), (2L, "multicategory It's a test"), (3L, 'multicategory Third'), (4L, 'multicategory Fourth')]

# OneToOneField ###############################################################

>>> class ImprovedArticleForm(ModelForm):

...     class Meta:

...         model = ImprovedArticle

>>> ImprovedArticleForm.base_fields.keys()

['article']

>>> class ImprovedArticleWithParentLinkForm(ModelForm):

...     class Meta:

...         model = ImprovedArticleWithParentLink

>>> ImprovedArticleWithParentLinkForm.base_fields.keys()

[]

# PhoneNumberField ############################################################

>>> class PhoneNumberForm(ModelForm):