innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

newforms: Changed BoundField form, field and name attributes to remove leading underscore to imply that they can be accessed 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-12-05 18:48:49 +00:00
parent 8925843d7e
commit 460ccfc045
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
django/newforms/forms.py
View File

@ -158,15 +158,15 @@ class Form(object):
class BoundField(object): class BoundField(object):
"A Field plus data" "A Field plus data"
def __init__(self, form, field, name): def __init__(self, form, field, name):
self._form = form self.form = form
self._field = field self.field = field
self._name = name self.name = name
def __str__(self): def __str__(self):
"Renders this field as an HTML widget." "Renders this field as an HTML widget."
# Use the 'widget' attribute on the field to determine which type # Use the 'widget' attribute on the field to determine which type
# of HTML widget to use. # of HTML widget to use.
value = self.as_widget(self._field.widget) value = self.as_widget(self.field.widget)
if not isinstance(value, basestring): if not isinstance(value, basestring):
# Some Widget render() methods -- notably RadioSelect -- return a # Some Widget render() methods -- notably RadioSelect -- return a
# "special" object rather than a string. Call the __str__() on that # "special" object rather than a string. Call the __str__() on that
@ -180,7 +180,7 @@ class BoundField(object):
if there are none. if there are none.
""" """
try: try:
return self._form.errors[self._name] return self.form.errors[self.name]
except KeyError: except KeyError:
return ErrorList() return ErrorList()
errors = property(_errors) errors = property(_errors)
@ -190,7 +190,7 @@ class BoundField(object):
auto_id = self.auto_id auto_id = self.auto_id
if auto_id and not attrs.has_key('id') and not widget.attrs.has_key('id'): if auto_id and not attrs.has_key('id') and not widget.attrs.has_key('id'):
attrs['id'] = auto_id attrs['id'] = auto_id
return widget.render(self._name, self.data, attrs=attrs) return widget.render(self.name, self.data, attrs=attrs)
def as_text(self, attrs=None): def as_text(self, attrs=None):
""" """
@ -210,11 +210,11 @@ class BoundField(object):
def _data(self): def _data(self):
"Returns the data for this BoundField, or None if it wasn't given." "Returns the data for this BoundField, or None if it wasn't given."
return self._form.data.get(self._name, None) return self.form.data.get(self.name, None)
data = property(_data) data = property(_data)
def _verbose_name(self): def _verbose_name(self):
return pretty_name(self._name) return pretty_name(self.name)
verbose_name = property(_verbose_name) verbose_name = property(_verbose_name)
def label_tag(self, contents=None): def label_tag(self, contents=None):
@ -224,7 +224,7 @@ class BoundField(object):
field's HTML-escaped verbose_name. field's HTML-escaped verbose_name.
""" """
contents = contents or escape(self.verbose_name) contents = contents or escape(self.verbose_name)
widget = self._field.widget widget = self.field.widget
id_ = widget.attrs.get('id') or self.auto_id id_ = widget.attrs.get('id') or self.auto_id
if id_: if id_:
contents = '<label for="%s">%s</label>' % (widget.id_for_label(id_), contents) contents = '<label for="%s">%s</label>' % (widget.id_for_label(id_), contents)
@ -232,7 +232,7 @@ class BoundField(object):
def _is_hidden(self): def _is_hidden(self):
"Returns True if this BoundField's widget is hidden." "Returns True if this BoundField's widget is hidden."
return self._field.widget.is_hidden return self.field.widget.is_hidden
is_hidden = property(_is_hidden) is_hidden = property(_is_hidden)
def _auto_id(self): def _auto_id(self):
@ -240,10 +240,10 @@ class BoundField(object):
Calculates and returns the ID attribute for this BoundField, if the Calculates and returns the ID attribute for this BoundField, if the
associated Form has specified auto_id. Returns an empty string otherwise. associated Form has specified auto_id. Returns an empty string otherwise.
""" """
auto_id = self._form.auto_id auto_id = self.form.auto_id
if auto_id and '%s' in str(auto_id): if auto_id and '%s' in str(auto_id):
return str(auto_id) % self._name return str(auto_id) % self.name
elif auto_id: elif auto_id:
return self._name return self.name
return '' return ''
auto_id = property(_auto_id) auto_id = property(_auto_id)