Moved newforms import out of Field.formfield()
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1147a57d20
commit
1c4ed6126b
|
@ -3,6 +3,7 @@ from django.dispatch import dispatcher
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import validators
|
from django.core import validators
|
||||||
from django import oldforms
|
from django import oldforms
|
||||||
|
from django import newforms as forms
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.utils.functional import curry
|
from django.utils.functional import curry
|
||||||
from django.utils.itercompat import tee
|
from django.utils.itercompat import tee
|
||||||
|
@ -335,9 +336,8 @@ class Field(object):
|
||||||
|
|
||||||
def formfield(self):
|
def formfield(self):
|
||||||
"Returns a django.newforms.Field instance for this database Field."
|
"Returns a django.newforms.Field instance for this database Field."
|
||||||
from django.newforms import CharField
|
|
||||||
# TODO: This is just a temporary default during development.
|
# TODO: This is just a temporary default during development.
|
||||||
return CharField(label=capfirst(self.verbose_name))
|
return forms.CharField(label=capfirst(self.verbose_name))
|
||||||
|
|
||||||
class AutoField(Field):
|
class AutoField(Field):
|
||||||
empty_strings_allowed = False
|
empty_strings_allowed = False
|
||||||
|
|
Loading…
Reference in New Issue