Changeset 7971
- Timestamp:
- 07/18/08 20:22:26 (3 months ago)
- Files:
-
- django/trunk/django/contrib/admin/options.py (modified) (2 diffs)
- django/trunk/django/contrib/admin/validation.py (modified) (1 diff)
- django/trunk/django/contrib/admin/widgets.py (modified) (1 diff)
- django/trunk/django/contrib/auth/forms.py (modified) (1 diff)
- django/trunk/django/contrib/formtools/tests.py (modified) (1 diff)
- django/trunk/django/contrib/formtools/wizard.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/ar/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/au/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/br/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/ca/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/ch/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/cl/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/de/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/es/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/fi/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/fr/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/generic/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/in_/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/is_/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/it/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/jp/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/mx/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/nl/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/no/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/pe/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/pl/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/sk/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/uk/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/us/forms.py (modified) (1 diff)
- django/trunk/django/contrib/localflavor/za/forms.py (modified) (1 diff)
- django/trunk/django/db/models/fields/__init__.py (modified) (2 diffs)
- django/trunk/django/db/models/fields/related.py (modified) (1 diff)
- django/trunk/django/forms/extras (added)
- django/trunk/django/forms/extras/__init__.py (moved) (moved from django/trunk/django/newforms/extras/__init__.py)
- django/trunk/django/forms/extras/widgets.py (moved) (moved from django/trunk/django/newforms/extras/widgets.py) (1 diff)
- django/trunk/django/forms/fields.py (moved) (moved from django/trunk/django/newforms/fields.py)
- django/trunk/django/forms/formsets.py (moved) (moved from django/trunk/django/newforms/formsets.py)
- django/trunk/django/forms/forms.py (moved) (moved from django/trunk/django/newforms/forms.py)
- django/trunk/django/forms/__init__.py (modified) (1 diff)
- django/trunk/django/forms/models.py (moved) (moved from django/trunk/django/newforms/models.py)
- django/trunk/django/forms/util.py (moved) (moved from django/trunk/django/newforms/util.py)
- django/trunk/django/forms/widgets.py (moved) (moved from django/trunk/django/newforms/widgets.py)
- django/trunk/django/newforms/__init__.py (modified) (1 diff)
- django/trunk/django/views/generic/create_update.py (modified) (1 diff)
- django/trunk/tests/modeltests/many_to_one/models.py (modified) (1 diff)
- django/trunk/tests/modeltests/model_formsets/models.py (modified) (2 diffs)
- django/trunk/tests/modeltests/model_forms/models.py (modified) (4 diffs)
- django/trunk/tests/modeltests/test_client/views.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/error_messages.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/extra.py (modified) (3 diffs)
- django/trunk/tests/regressiontests/forms/fields.py (modified) (4 diffs)
- django/trunk/tests/regressiontests/forms/formsets.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/forms.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/media.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/models.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/regressions.py (modified) (1 diff)
- django/trunk/tests/regressiontests/forms/util.py (modified) (2 diffs)
- django/trunk/tests/regressiontests/forms/widgets.py (modified) (1 diff)
- django/trunk/tests/regressiontests/inline_formsets/models.py (modified) (1 diff)
- django/trunk/tests/regressiontests/modeladmin/models.py (modified) (3 diffs)
- django/trunk/tests/regressiontests/views/views.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/contrib/admin/options.py
r7967 r7971 1 1 from django import oldforms, template 2 from django import newforms asforms3 from django. newforms.formsets import all_valid4 from django. newforms.models import modelform_factory, inlineformset_factory5 from django. newforms.models import BaseInlineFormset2 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 6 6 from django.contrib.contenttypes.models import ContentType 7 7 from django.contrib.admin import widgets … … 776 776 777 777 def deletion_field(self): 778 from django. newforms.formsets import DELETION_FIELD_NAME778 from django.forms.formsets import DELETION_FIELD_NAME 779 779 return AdminField(self.form, DELETION_FIELD_NAME, False) 780 780 781 781 def ordering_field(self): 782 from django. newforms.formsets import ORDERING_FIELD_NAME782 from django.forms.formsets import ORDERING_FIELD_NAME 783 783 return AdminField(self.form, ORDERING_FIELD_NAME, False) 784 784 django/trunk/django/contrib/admin/validation.py
r7967 r7971 2 2 from django.core.exceptions import ImproperlyConfigured 3 3 from django.db import models 4 from django. newforms.models import BaseModelForm, BaseModelFormSet, fields_for_model4 from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model 5 5 from django.contrib.admin.options import flatten_fieldsets, BaseModelAdmin 6 6 from django.contrib.admin.options import HORIZONTAL, VERTICAL django/trunk/django/contrib/admin/widgets.py
r7967 r7971 5 5 import copy 6 6 7 from django import newforms asforms8 from django. newforms.widgets import RadioFieldRenderer9 from django. newforms.util import flatatt7 from django import forms 8 from django.forms.widgets import RadioFieldRenderer 9 from django.forms.util import flatatt 10 10 from django.utils.datastructures import MultiValueDict 11 11 from django.utils.text import capfirst, truncate_words django/trunk/django/contrib/auth/forms.py
r7967 r7971 4 4 from django.template import Context, loader 5 5 from django.core import validators 6 from django import newforms asforms6 from django import forms 7 7 from django.utils.translation import ugettext_lazy as _ 8 8 django/trunk/django/contrib/formtools/tests.py
r7805 r7971 1 from django import newforms asforms1 from django import forms 2 2 from django.contrib.formtools import preview 3 3 from django import http django/trunk/django/contrib/formtools/wizard.py
r7657 r7971 5 5 """ 6 6 7 from django import newforms asforms7 from django import forms 8 8 from django.conf import settings 9 9 from django.http import Http404 django/trunk/django/contrib/localflavor/ar/forms.py
r7689 r7971 4 4 """ 5 5 6 from django. newforms import ValidationError7 from django. newforms.fields import RegexField, CharField, Select, EMPTY_VALUES6 from django.forms import ValidationError 7 from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES 8 8 from django.utils.encoding import smart_unicode 9 9 from django.utils.translation import ugettext_lazy as _ django/trunk/django/contrib/localflavor/au/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES7 from django. newforms.util import smart_unicode5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 from django.forms.util import smart_unicode 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 import re django/trunk/django/contrib/localflavor/br/forms.py
r7689 r7971 4 4 """ 5 5 6 from django. newforms import ValidationError7 from django. newforms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES6 from django.forms import ValidationError 7 from django.forms.fields import Field, RegexField, CharField, Select, EMPTY_VALUES 8 8 from django.utils.encoding import smart_unicode 9 9 from django.utils.translation import ugettext_lazy as _ django/trunk/django/contrib/localflavor/ca/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES7 from django. newforms.util import smart_unicode5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 from django.forms.util import smart_unicode 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 import re django/trunk/django/contrib/localflavor/ch/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 7 from django.utils.encoding import smart_unicode 8 8 from django.utils.translation import ugettext_lazy as _ django/trunk/django/contrib/localflavor/cl/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import RegexField, Select, EMPTY_VALUES 7 7 from django.utils.translation import ugettext_lazy as _ 8 8 from django.utils.encoding import smart_unicode django/trunk/django/contrib/localflavor/de/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 7 from django.utils.translation import ugettext_lazy as _ 8 8 import re django/trunk/django/contrib/localflavor/es/forms.py
r7689 r7971 4 4 """ 5 5 6 from django. newforms import ValidationError7 from django. newforms.fields import RegexField, Select, EMPTY_VALUES6 from django.forms import ValidationError 7 from django.forms.fields import RegexField, Select, EMPTY_VALUES 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 import re django/trunk/django/contrib/localflavor/fi/forms.py
r7689 r7971 4 4 5 5 import re 6 from django. newforms import ValidationError7 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES6 from django.forms import ValidationError 7 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 django/trunk/django/contrib/localflavor/fr/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 7 from django.utils.encoding import smart_unicode 8 8 from django.utils.translation import ugettext_lazy as _ django/trunk/django/contrib/localflavor/generic/forms.py
r7294 r7971 1 from django import newforms asforms1 from django import forms 2 2 3 3 DEFAULT_DATE_INPUT_FORMATS = ( django/trunk/django/contrib/localflavor/in_/forms.py
r6926 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 7 from django.utils.encoding import smart_unicode 8 8 from django.utils.translation import gettext django/trunk/django/contrib/localflavor/is_/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import RegexField, EMPTY_VALUES7 from django. newforms.widgets import Select5 from django.forms import ValidationError 6 from django.forms.fields import RegexField, EMPTY_VALUES 7 from django.forms.widgets import Select 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 from django.utils.encoding import smart_unicode django/trunk/django/contrib/localflavor/it/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 7 from django.utils.translation import ugettext_lazy as _ 8 8 from django.utils.encoding import smart_unicode django/trunk/django/contrib/localflavor/jp/forms.py
r7689 r7971 4 4 5 5 from django.core import validators 6 from django. newforms import ValidationError6 from django.forms import ValidationError 7 7 from django.utils.translation import ugettext_lazy as _ 8 from django. newforms.fields import RegexField, Select8 from django.forms.fields import RegexField, Select 9 9 10 10 class JPPostalCodeField(RegexField): django/trunk/django/contrib/localflavor/mx/forms.py
r7294 r7971 3 3 """ 4 4 5 from django. newforms.fields import Select5 from django.forms.fields import Select 6 6 7 7 class MXStateSelect(Select): django/trunk/django/contrib/localflavor/nl/forms.py
r7689 r7971 5 5 import re 6 6 7 from django. newforms import ValidationError8 from django. newforms.fields import Field, Select, EMPTY_VALUES7 from django.forms import ValidationError 8 from django.forms.fields import Field, Select, EMPTY_VALUES 9 9 from django.utils.translation import ugettext_lazy as _ 10 10 from django.utils.encoding import smart_unicode django/trunk/django/contrib/localflavor/no/forms.py
r7689 r7971 4 4 5 5 import re, datetime 6 from django. newforms import ValidationError7 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES6 from django.forms import ValidationError 7 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 django/trunk/django/contrib/localflavor/pe/forms.py
r7689 r7971 4 4 """ 5 5 6 from django. newforms import ValidationError7 from django. newforms.fields import RegexField, CharField, Select, EMPTY_VALUES6 from django.forms import ValidationError 7 from django.forms.fields import RegexField, CharField, Select, EMPTY_VALUES 8 8 from django.utils.translation import ugettext_lazy as _ 9 9 django/trunk/django/contrib/localflavor/pl/forms.py
r7689 r7971 5 5 import re 6 6 7 from django. newforms import ValidationError8 from django. newforms.fields import Select, RegexField7 from django.forms import ValidationError 8 from django.forms.fields import Select, RegexField 9 9 from django.utils.translation import ugettext_lazy as _ 10 10 django/trunk/django/contrib/localflavor/sk/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms.fields import Select, RegexField5 from django.forms.fields import Select, RegexField 6 6 from django.utils.translation import ugettext_lazy as _ 7 7 django/trunk/django/contrib/localflavor/uk/forms.py
r7689 r7971 5 5 import re 6 6 7 from django. newforms.fields import CharField, Select8 from django. newforms import ValidationError7 from django.forms.fields import CharField, Select 8 from django.forms import ValidationError 9 9 from django.utils.translation import ugettext_lazy as _ 10 10 django/trunk/django/contrib/localflavor/us/forms.py
r7689 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, Select, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, Select, EMPTY_VALUES 7 7 from django.utils.encoding import smart_unicode 8 8 from django.utils.translation import ugettext_lazy as _ django/trunk/django/contrib/localflavor/za/forms.py
r7294 r7971 3 3 """ 4 4 5 from django. newforms import ValidationError6 from django. newforms.fields import Field, RegexField, EMPTY_VALUES5 from django.forms import ValidationError 6 from django.forms.fields import Field, RegexField, EMPTY_VALUES 7 7 from django.utils.checksums import luhn 8 8 from django.utils.translation import gettext as _ django/trunk/django/db/models/fields/__init__.py
r7967 r7971 15 15 from django.core import validators 16 16 from django import oldforms 17 from django import newforms asforms17 from django import forms 18 18 from django.core.exceptions import ObjectDoesNotExist 19 19 from django.utils.datastructures import DictWrapper … … 412 412 413 413 def formfield(self, form_class=forms.CharField, **kwargs): 414 "Returns a django. newforms.Field instance for this database Field."414 "Returns a django.forms.Field instance for this database Field." 415 415 defaults = {'required': not self.blank, 'label': capfirst(self.verbose_name), 'help_text': self.help_text} 416 416 if self.choices: django/trunk/django/db/models/fields/related.py
r7967 r7971 10 10 from django.core import validators 11 11 from django import oldforms 12 from django import newforms asforms12 from django import forms 13 13 from django.dispatch import dispatcher 14 14 django/trunk/django/forms/extras/widgets.py
r7337 r7971 6 6 import re 7 7 8 from django. newforms.widgets import Widget, Select8 from django.forms.widgets import Widget, Select 9 9 from django.utils.dates import MONTHS 10 10 from django.utils.safestring import mark_safe django/trunk/django/forms/__init__.py
r4234 r7971 1 from django.oldforms import * 1 """ 2 Django validation and HTML form handling. 3 4 TODO: 5 Default value for field 6 Field labels 7 Nestable Forms 8 FatalValidationError -- short-circuits all other validators on a form 9 ValidationWarning 10 "This form field requires foo.js" and form.js_includes() 11 """ 12 13 from util import ValidationError 14 from widgets import * 15 from fields import * 16 from forms import * 17 from models import * django/trunk/django/newforms/__init__.py
r7967 r7971 1 """ 2 Django validation and HTML form handling. 3 4 TODO: 5 Default value for field 6 Field labels 7 Nestable Forms 8 FatalValidationError -- short-circuits all other validators on a form 9 ValidationWarning 10 "This form field requires foo.js" and form.js_includes() 11 """ 12 13 from util import ValidationError 14 from widgets import * 15 from fields import * 16 from forms import * 17 from models import * 18 from formsets import * 1 import warnings 2 warnings.warn( 3 category = DeprecationWarning, 4 message = "django.newforms is no longer new. Import django.forms instead.", 5 stacklevel = 2 6 ) 7 from django.forms import * django/trunk/django/views/generic/create_update.py
r7966 r7971 1 from django. newforms.models import ModelFormMetaclass, ModelForm1 from django.forms.models import ModelFormMetaclass, ModelForm 2 2 from django.template import RequestContext, loader 3 3 from django.http import Http404, HttpResponse, HttpResponseRedirect django/trunk/tests/modeltests/many_to_one/models.py
r7625 r7971 156 156 157 157 # And should work fine with the unicode that comes out of 158 # newforms.Form.cleaned_data158 # forms.Form.cleaned_data 159 159 >>> Article.objects.filter(reporter__first_name__exact='John').extra(where=["many_to_one_reporter.last_name='%s'" % u'Smith']) 160 160 [<Article: John's second story>, <Article: This is a test>] django/trunk/tests/modeltests/model_formsets/models.py
r7967 r7971 27 27 >>> from datetime import date 28 28 29 >>> from django. newforms.models import modelformset_factory29 >>> from django.forms.models import modelformset_factory 30 30 31 31 >>> qs = Author.objects.all() … … 228 228 admin system's edit inline functionality works. 229 229 230 >>> from django. newforms.models import inlineformset_factory230 >>> from django.forms.models import inlineformset_factory 231 231 232 232 >>> AuthorBooksFormSet = inlineformset_factory(Author, Book, can_delete=False, extra=3) django/trunk/tests/modeltests/model_forms/models.py
r7967 r7971 80 80 81 81 __test__ = {'API_TESTS': """ 82 >>> from django import newforms asforms83 >>> from django. newforms.models import ModelForm82 >>> from django import forms 83 >>> from django.forms.models import ModelForm 84 84 >>> from django.core.files.uploadedfile import SimpleUploadedFile 85 85 … … 114 114 115 115 >>> CategoryForm.base_fields['url'].__class__ 116 <class 'django. newforms.fields.BooleanField'>116 <class 'django.forms.fields.BooleanField'> 117 117 118 118 … … 212 212 # Old form_for_x tests ####################################################### 213 213 214 >>> from django. newforms import ModelForm, CharField214 >>> from django.forms import ModelForm, CharField 215 215 >>> import datetime 216 216 … … 606 606 # ModelChoiceField ############################################################ 607 607 608 >>> from django. newforms import ModelChoiceField, ModelMultipleChoiceField608 >>> from django.forms import ModelChoiceField, ModelMultipleChoiceField 609 609 610 610 >>> f = ModelChoiceField(Category.objects.all()) django/trunk/tests/modeltests/test_client/views.py
r7900 r7971 5 5 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound 6 6 from django.contrib.auth.decorators import login_required, permission_required 7 from django. newforms.forms import Form8 from django. newforms import fields7 from django.forms.forms import Form 8 from django.forms import fields 9 9 from django.shortcuts import render_to_response 10 10 django/trunk/tests/regressiontests/forms/error_messages.py
r7814 r7971 1 1 # -*- coding: utf-8 -*- 2 2 tests = r""" 3 >>> from django. newforms import *3 >>> from django.forms import * 4 4 >>> from django.core.files.uploadedfile import SimpleUploadedFile 5 5 django/trunk/tests/regressiontests/forms/extra.py
r7337 r7971 1 1 # -*- coding: utf-8 -*- 2 2 tests = r""" 3 >>> from django. newforms import *3 >>> from django.forms import * 4 4 >>> from django.utils.encoding import force_unicode 5 5 >>> import datetime … … 15 15 ############### 16 16 17 The newforms library comes with some extra, higher-level Field and Widget17 The forms library comes with some extra, higher-level Field and Widget 18 18 classes that demonstrate some of the library's abilities. 19 19 20 20 # SelectDateWidget ############################################################ 21 21 22 >>> from django. newforms.extras import SelectDateWidget22 >>> from django.forms.extras import SelectDateWidget 23 23 >>> w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016')) 24 24 >>> print w.render('mydate', '') … … 425 425 ####################################### 426 426 427 >>> from django. newforms.util import ErrorList427 >>> from django.forms.util import ErrorList 428 428 >>> class DivErrorList(ErrorList): 429 429 ... def __unicode__(self): django/trunk/tests/regressiontests/forms/fields.py
r7859 r7971 1 1 # -*- coding: utf-8 -*- 2 2 tests = r""" 3 >>> from django. newforms import *4 >>> from django. newforms.widgets import RadioFieldRenderer3 >>> from django.forms import * 4 >>> from django.forms.widgets import RadioFieldRenderer 5 5 >>> from django.core.files.uploadedfile import SimpleUploadedFile 6 6 >>> import datetime … … 18 18 19 19 Each Field class does some sort of validation. Each Field has a clean() method, 20 which either raises django. newforms.ValidationError or returns the "clean"20 which either raises django.forms.ValidationError or returns the "clean" 21 21 data -- usually a Unicode object, but, in some rare cases, a list. 22 22 … … 1154 1154 ... 1155 1155 >>> import os 1156 >>> from django import newforms asforms1156 >>> from django import forms 1157 1157 >>> path = forms.__file__ 1158 1158 >>> path = os.path.dirname(path) + '/' 1159 1159 >>> fix_os_paths(path) 1160 '.../django/ newforms/'1160 '.../django/forms/' 1161 1161 >>> f = forms.FilePathField(path=path) 1162 1162 >>> f.choices.sort() 1163 1163 >>> fix_os_paths(f.choices) 1164 [('.../django/ newforms/__init__.py', '__init__.py'), ('.../django/newforms/__init__.pyc', '__init__.pyc'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/fields.pyc', 'fields.pyc'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/forms.pyc', 'forms.pyc'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/models.pyc', 'models.pyc'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/util.pyc', 'util.pyc'), ('.../django/newforms/widgets.py', 'widgets.py'), ('.../django/newforms/widgets.pyc', 'widgets.pyc')]1164 [('.../django/forms/__init__.py', '__init__.py'), ('.../django/forms/__init__.pyc', '__init__.pyc'), ('.../django/forms/fields.py', 'fields.py'), ('.../django/forms/fields.pyc', 'fields.pyc'), ('.../django/forms/forms.py', 'forms.py'), ('.../django/forms/forms.pyc', 'forms.pyc'), ('.../django/forms/models.py', 'models.py'), ('.../django/forms/models.pyc', 'models.pyc'), ('.../django/forms/util.py', 'util.py'), ('.../django/forms/util.pyc', 'util.pyc'), ('.../django/forms/widgets.py', 'widgets.py'), ('.../django/forms/widgets.pyc', 'widgets.pyc')] 1165 1165 >>> f.clean('fields.py') 1166 1166 Traceback (most recent call last): … … 1168 1168 ValidationError: [u'Select a valid choice. That choice is not one of the available choices.'] 1169 1169 >>> fix_os_paths(f.clean(path + 'fields.py')) 1170 u'.../django/ newforms/fields.py'1170 u'.../django/forms/fields.py' 1171 1171 >>> f = forms.FilePathField(path=path, match='^.*?\.py$') 1172 1172 >>> f.choices.sort() 1173 1173 >>> fix_os_paths(f.choices) 1174 [('.../django/ newforms/__init__.py', '__init__.py'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/widgets.py', 'widgets.py')]1174 [('.../django/forms/__init__.py', '__init__.py'), ('.../django/forms/fields.py', 'fields.py'), ('.../django/forms/forms.py', 'forms.py'), ('.../django/forms/models.py', 'models.py'), ('.../django/forms/util.py', 'util.py'), ('.../django/forms/widgets.py', 'widgets.py')] 1175 1175 >>> f = forms.FilePathField(path=path, recursive=True, match='^.*?\.py$') 1176 1176 >>> f.choices.sort() 1177 1177 >>> fix_os_paths(f.choices) 1178 [('.../django/ newforms/__init__.py', '__init__.py'), ('.../django/newforms/extras/__init__.py', 'extras/__init__.py'), ('.../django/newforms/extras/widgets.py', 'extras/widgets.py'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/widgets.py', 'widgets.py')]1178 [('.../django/forms/__init__.py', '__init__.py'), ('.../django/forms/extras/__init__.py', 'extras/__init__.py'), ('.../django/forms/extras/widgets.py', 'extras/widgets.py'), ('.../django/forms/fields.py', 'fields.py'), ('.../django/forms/forms.py', 'forms.py'), ('.../django/forms/models.py', 'models.py'), ('.../django/forms/util.py', 'util.py'), ('.../django/forms/widgets.py', 'widgets.py')] 1179 1179 1180 1180 # SplitDateTimeField ########################################################## django/trunk/tests/regressiontests/forms/formsets.py
r7967 r7971 6 6 the best way to create a FormSet is by using the formset_factory function. 7 7 8 >>> from django. newforms import Form, CharField, IntegerField, ValidationError9 >>> from django. newforms.formsets import formset_factory, BaseFormSet8 >>> from django.forms import Form, CharField, IntegerField, ValidationError 9 >>> from django.forms.formsets import formset_factory, BaseFormSet 10 10 11 11 >>> class Choice(Form): django/trunk/tests/regressiontests/forms/forms.py
r7967 r7971 1 1 # -*- coding: utf-8 -*- 2 2 tests = r""" 3 >>> from django. newforms import *3 >>> from django.forms import * 4 4 >>> from django.core.files.uploadedfile import SimpleUploadedFile 5 5 >>> import datetime django/trunk/tests/regressiontests/forms/media.py
r7967 r7971 3 3 4 4 media_tests = r""" 5 >>> from django. newforms import TextInput, Media, TextInput, CharField, Form, MultiWidget5 >>> from django.forms import TextInput, Media, TextInput, CharField, Form, MultiWidget 6 6 >>> from django.conf import settings 7 7 >>> ORIGINAL_MEDIA_URL = settings.MEDIA_URL django/trunk/tests/regressiontests/forms/models.py
r6694 r7971 16 16 17 17 __test__ = {'API_TESTS': """ 18 >>> from django. newforms import form_for_model, form_for_instance18 >>> from django.forms import form_for_model, form_for_instance 19 19 20 20 # Boundary conditions on a PostitiveIntegerField #########################
