From 46786b4193e04d398532bbfc3dcf63c03c1793cb Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Sat, 19 Jul 2008 01:22:26 +0000 Subject: 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 --- tests/modeltests/many_to_one/models.py | 2 +- tests/modeltests/model_forms/models.py | 10 +++++----- tests/modeltests/model_formsets/models.py | 4 ++-- tests/modeltests/test_client/views.py | 4 ++-- tests/regressiontests/forms/error_messages.py | 2 +- tests/regressiontests/forms/extra.py | 8 ++++---- tests/regressiontests/forms/fields.py | 18 +++++++++--------- tests/regressiontests/forms/forms.py | 2 +- tests/regressiontests/forms/formsets.py | 4 ++-- tests/regressiontests/forms/media.py | 2 +- tests/regressiontests/forms/models.py | 2 +- tests/regressiontests/forms/regressions.py | 2 +- tests/regressiontests/forms/util.py | 6 +++--- tests/regressiontests/forms/widgets.py | 4 ++-- tests/regressiontests/inline_formsets/models.py | 2 +- tests/regressiontests/modeladmin/models.py | 12 ++++++------ tests/regressiontests/views/views.py | 2 +- 17 files changed, 43 insertions(+), 43 deletions(-) (limited to 'tests') diff --git a/tests/modeltests/many_to_one/models.py b/tests/modeltests/many_to_one/models.py index dfb17b8344..081cffb807 100644 --- a/tests/modeltests/many_to_one/models.py +++ b/tests/modeltests/many_to_one/models.py @@ -155,7 +155,7 @@ False [, ] # And should work fine with the unicode that comes out of -# newforms.Form.cleaned_data +# forms.Form.cleaned_data >>> Article.objects.filter(reporter__first_name__exact='John').extra(where=["many_to_one_reporter.last_name='%s'" % u'Smith']) [, ] diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py index 6838f11d4e..cc9efd0f94 100644 --- a/tests/modeltests/model_forms/models.py +++ b/tests/modeltests/model_forms/models.py @@ -79,8 +79,8 @@ class ImageFile(models.Model): return self.description __test__ = {'API_TESTS': """ ->>> from django import newforms as forms ->>> from django.newforms.models import ModelForm +>>> from django import forms +>>> from django.forms.models import ModelForm >>> from django.core.files.uploadedfile import SimpleUploadedFile The bare bones, absolutely nothing custom, basic case. @@ -113,7 +113,7 @@ Replacing a field. ... model = Category >>> CategoryForm.base_fields['url'].__class__ - + Using 'fields'. @@ -211,7 +211,7 @@ We can also subclass the Meta inner class to change the fields list. # Old form_for_x tests ####################################################### ->>> from django.newforms import ModelForm, CharField +>>> from django.forms import ModelForm, CharField >>> import datetime >>> Category.objects.all() @@ -605,7 +605,7 @@ the data in the database when the form is instantiated. # ModelChoiceField ############################################################ ->>> from django.newforms import ModelChoiceField, ModelMultipleChoiceField +>>> from django.forms import ModelChoiceField, ModelMultipleChoiceField >>> f = ModelChoiceField(Category.objects.all()) >>> list(f.choices) diff --git a/tests/modeltests/model_formsets/models.py b/tests/modeltests/model_formsets/models.py index 84265450fc..5958b8c27a 100644 --- a/tests/modeltests/model_formsets/models.py +++ b/tests/modeltests/model_formsets/models.py @@ -26,7 +26,7 @@ __test__ = {'API_TESTS': """ >>> from datetime import date ->>> from django.newforms.models import modelformset_factory +>>> from django.forms.models import modelformset_factory >>> qs = Author.objects.all() >>> AuthorFormSet = modelformset_factory(Author, extra=3) @@ -227,7 +227,7 @@ used. We can also create a formset that is tied to a parent model. This is how the admin system's edit inline functionality works. ->>> from django.newforms.models import inlineformset_factory +>>> from django.forms.models import inlineformset_factory >>> AuthorBooksFormSet = inlineformset_factory(Author, Book, can_delete=False, extra=3) >>> author = Author.objects.get(name='Charles Baudelaire') diff --git a/tests/modeltests/test_client/views.py b/tests/modeltests/test_client/views.py index f4eab6462d..111c72e7f5 100644 --- a/tests/modeltests/test_client/views.py +++ b/tests/modeltests/test_client/views.py @@ -4,8 +4,8 @@ from django.core.mail import EmailMessage, SMTPConnection from django.template import Context, Template from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound from django.contrib.auth.decorators import login_required, permission_required -from django.newforms.forms import Form -from django.newforms import fields +from django.forms.forms import Form +from django.forms import fields from django.shortcuts import render_to_response def get_view(request): diff --git a/tests/regressiontests/forms/error_messages.py b/tests/regressiontests/forms/error_messages.py index 580326f894..ec91b57a06 100644 --- a/tests/regressiontests/forms/error_messages.py +++ b/tests/regressiontests/forms/error_messages.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- tests = r""" ->>> from django.newforms import * +>>> from django.forms import * >>> from django.core.files.uploadedfile import SimpleUploadedFile # CharField ################################################################### diff --git a/tests/regressiontests/forms/extra.py b/tests/regressiontests/forms/extra.py index a8b369715d..80f7ef6535 100644 --- a/tests/regressiontests/forms/extra.py +++ b/tests/regressiontests/forms/extra.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- tests = r""" ->>> from django.newforms import * +>>> from django.forms import * >>> from django.utils.encoding import force_unicode >>> import datetime >>> import time @@ -14,12 +14,12 @@ tests = r""" # Extra stuff # ############### -The newforms library comes with some extra, higher-level Field and Widget +The forms library comes with some extra, higher-level Field and Widget classes that demonstrate some of the library's abilities. # SelectDateWidget ############################################################ ->>> from django.newforms.extras import SelectDateWidget +>>> from django.forms.extras import SelectDateWidget >>> w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016')) >>> print w.render('mydate', '')