Commit 46786b41 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #7741: django.newforms is now django.forms. This is obviously a... 

Fixed #7741: django.newforms is now django.forms. This is obviously a backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 39af2738

django/contrib/admin/options.py

+6 −6
Original line number Diff line number Diff line 
from django import oldforms, template

from django import newforms as forms

from django.newforms.formsets import all_valid

from django.newforms.models import modelform_factory, inlineformset_factory

from django.newforms.models import BaseInlineFormset

from django import forms

from django.forms.formsets import all_valid

from django.forms.models import modelform_factory, inlineformset_factory

from django.forms.models import BaseInlineFormset

from django.contrib.contenttypes.models import ContentType

from django.contrib.admin import widgets

from django.contrib.admin.util import quote, unquote, get_deleted_objects
@@ -775,11 +775,11 @@ class InlineAdminForm(AdminForm): 
        return AdminField(self.form, self.formset._pk_field_name, False)



    def deletion_field(self):

        from django.newforms.formsets import DELETION_FIELD_NAME

        from django.forms.formsets import DELETION_FIELD_NAME

        return AdminField(self.form, DELETION_FIELD_NAME, False)



    def ordering_field(self):

        from django.newforms.formsets import ORDERING_FIELD_NAME

        from django.forms.formsets import ORDERING_FIELD_NAME

        return AdminField(self.form, ORDERING_FIELD_NAME, False)



class AdminErrorList(forms.util.ErrorList):

django/contrib/admin/validation.py

+1 −1
Original line number Diff line number Diff line 


from django.core.exceptions import ImproperlyConfigured

from django.db import models

from django.newforms.models import BaseModelForm, BaseModelFormSet, fields_for_model

from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model

from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin

from django.contrib.admin.options import HORIZONTAL, VERTICAL

django/contrib/admin/widgets.py

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ Form Widget classes specific to the Django admin site. 


import copy



from django import newforms as forms

from django.newforms.widgets import RadioFieldRenderer

from django.newforms.util import flatatt

from django import forms

from django.forms.widgets import RadioFieldRenderer

from django.forms.util import flatatt

from django.utils.datastructures import MultiValueDict

from django.utils.text import capfirst, truncate_words

from django.utils.translation import ugettext as _

django/contrib/auth/forms.py

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ from django.contrib.auth import authenticate 
from django.contrib.sites.models import Site

from django.template import Context, loader

from django.core import validators

from django import newforms as forms

from django import forms

from django.utils.translation import ugettext_lazy as _



class UserCreationForm(forms.ModelForm):

django/contrib/formtools/tests.py

+1 −1
Original line number Diff line number Diff line 
from django import newforms as forms

from django import forms

from django.contrib.formtools import preview

from django import http

from django.conf import settings