Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 46786b4

Browse files
committed
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
1 parent 39af273 commit 46786b4

File tree

60 files changed

+133
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+133
-128
lines changed

‎django/contrib/admin/options.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from django import oldforms, template
2-
from django import newformsasforms
3-
from django.newforms.formsets import all_valid
4-
from django.newforms.models import modelform_factory, inlineformset_factory
5-
from django.newforms.models import BaseInlineFormset
2+
from django import forms
3+
from django.forms.formsets import all_valid
4+
from django.forms.models import modelform_factory, inlineformset_factory
5+
from django.forms.models import BaseInlineFormset
66
from django.contrib.contenttypes.models import ContentType
77
from django.contrib.admin import widgets
88
from django.contrib.admin.util import quote, unquote, get_deleted_objects
@@ -775,11 +775,11 @@ def pk_field(self):
775775
return AdminField(self.form, self.formset._pk_field_name, False)
776776

777777
def deletion_field(self):
778-
from django.newforms.formsets import DELETION_FIELD_NAME
778+
from django.forms.formsets import DELETION_FIELD_NAME
779779
return AdminField(self.form, DELETION_FIELD_NAME, False)
780780

781781
def ordering_field(self):
782-
from django.newforms.formsets import ORDERING_FIELD_NAME
782+
from django.forms.formsets import ORDERING_FIELD_NAME
783783
return AdminField(self.form, ORDERING_FIELD_NAME, False)
784784

785785
class AdminErrorList(forms.util.ErrorList):

‎django/contrib/admin/validation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
from django.core.exceptions import ImproperlyConfigured
33
from django.db import models
4-
from django.newforms.models import BaseModelForm, BaseModelFormSet, fields_for_model
4+
from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model
55
from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin
66
from django.contrib.admin.options import HORIZONTAL, VERTICAL
77

‎django/contrib/admin/widgets.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import copy
66

7-
from django import newformsasforms
8-
from django.newforms.widgets import RadioFieldRenderer
9-
from django.newforms.util import flatatt
7+
from django import forms
8+
from django.forms.widgets import RadioFieldRenderer
9+
from django.forms.util import flatatt
1010
from django.utils.datastructures import MultiValueDict
1111
from django.utils.text import capfirst, truncate_words
1212
from django.utils.translation import ugettext as _

‎django/contrib/auth/forms.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from django.contrib.sites.models import Site
44
from django.template import Context, loader
55
from django.core import validators
6-
from django import newformsasforms
6+
from django import forms
77
from django.utils.translation import ugettext_lazy as _
88

99
class UserCreationForm(forms.ModelForm):

‎django/contrib/formtools/tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django import newformsasforms
1+
from django import forms
22
from django.contrib.formtools import preview
33
from django import http
44
from django.conf import settings

‎django/contrib/formtools/wizard.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
stored on the server side.
55
"""
66

7-
from django import newformsasforms
7+
from django import forms
88
from django.conf import settings
99
from django.http import Http404
1010
from django.shortcuts import render_to_response

‎django/contrib/localflavor/ar/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
AR-specific Form helpers.
44
"""
55

6-
from django.newforms import ValidationError
7-
from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES
6+
from django.forms import ValidationError
7+
from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES
88
from django.utils.encoding import smart_unicode
99
from django.utils.translation import ugettext_lazy as _
1010

‎django/contrib/localflavor/au/forms.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
Australian-specific Form helpers
33
"""
44

5-
from django.newforms import ValidationError
6-
from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
7-
from django.newforms.util import smart_unicode
5+
from django.forms import ValidationError
6+
from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES
7+
from django.forms.util import smart_unicode
88
from django.utils.translation import ugettext_lazy as _
99
import re
1010

‎django/contrib/localflavor/br/forms.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
BR-specific Form helpers
44
"""
55

6-
from django.newforms import ValidationError
7-
from django.newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES
6+
from django.forms import ValidationError
7+
from django.forms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES
88
from django.utils.encoding import smart_unicode
99
from django.utils.translation import ugettext_lazy as _
1010
import re

‎django/contrib/localflavor/ca/forms.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
Canada-specific Form helpers
33
"""
44

5-
from django.newforms import ValidationError
6-
from django.newforms.fields import Field, RegexField, Select, EMPTY_VALUES
7-
from django.newforms.util import smart_unicode
5+
from django.forms import ValidationError
6+
from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES
7+
from django.forms.util import smart_unicode
88
from django.utils.translation import ugettext_lazy as _
99
import re
1010

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /