test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #3278 -- newforms: Fixed bug in DeclarativeFieldsMetaclass where it inadvertently overrode the class' name. Thanks, russblau@imapmail.org 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-10 22:46:06 +00:00
parent 2144a2c23f
commit f6a7002ef1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/newforms/forms.py
View File

@ -29,7 +29,7 @@ class SortedDictFromList(SortedDict):
class DeclarativeFieldsMetaclass(type): class DeclarativeFieldsMetaclass(type):
"Metaclass that converts Field attributes to a dictionary called 'fields'." "Metaclass that converts Field attributes to a dictionary called 'fields'."
def __new__(cls, name, bases, attrs): def __new__(cls, name, bases, attrs):
fields = [(name, attrs.pop(name)) for name, obj in attrs.items() if isinstance(obj, Field)] fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter)) fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
attrs['fields'] = SortedDictFromList(fields) attrs['fields'] = SortedDictFromList(fields)
return type.__new__(cls, name, bases, attrs) return type.__new__(cls, name, bases, attrs)

6
tests/regressiontests/forms/tests.py
View File

@ -1551,7 +1551,7 @@ False
>>> p.clean_data >>> p.clean_data
Traceback (most recent call last): Traceback (most recent call last):
... ...
AttributeError: 'birthday' object has no attribute 'clean_data' AttributeError: 'Person' object has no attribute 'clean_data'
>>> print p >>> print p
<tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr> <tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr>
<tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr> <tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr>
@ -1585,7 +1585,7 @@ False
>>> p.clean_data >>> p.clean_data
Traceback (most recent call last): Traceback (most recent call last):
... ...
AttributeError: 'birthday' object has no attribute 'clean_data' AttributeError: 'Person' object has no attribute 'clean_data'
>>> print p >>> print p
<tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr> <tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr>
<tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr> <tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr>
@ -1627,7 +1627,7 @@ u'<ul class="errorlist"><li>first_name<ul class="errorlist"><li>This field is re
>>> p.clean_data >>> p.clean_data
Traceback (most recent call last): Traceback (most recent call last):
... ...
AttributeError: 'birthday' object has no attribute 'clean_data' AttributeError: 'Person' object has no attribute 'clean_data'
>>> p['first_name'].errors >>> p['first_name'].errors
[u'This field is required.'] [u'This field is required.']
>>> p['first_name'].errors.as_ul() >>> p['first_name'].errors.as_ul()