web/formfields.py
branchstable
changeset 7879 9aae456abab5
parent 7756 98e34ae4cf89
child 7894 ad0eeb0f7a8d
--- a/web/formfields.py	Tue Sep 27 16:04:30 2011 +0200
+++ b/web/formfields.py	Wed Sep 28 09:27:42 2011 +0200
@@ -28,7 +28,7 @@
 
 .. autoclass:: cubicweb.web.formfields.Field
 
-Now, you usually don't use that class but one of the concret field classes
+Now, you usually don't use that class but one of the concrete field classes
 described below, according to what you want to edit.
 
 Basic fields
@@ -107,7 +107,7 @@
 class Field(object):
     """This class is the abstract base class for all fields. It hold a bunch
     of attributes which may be used for fine control of the behaviour of a
-    concret field.
+    concrete field.
 
     **Attributes**
 
@@ -349,6 +349,7 @@
     def initial_typed_value(self, form, load_bytes):
         if self.value is not _MARKER:
             if callable(self.value):
+                # pylint: disable=E1102
                 if support_args(self.value, 'form', 'field'):
                     return self.value(form, self)
                 else:
@@ -389,6 +390,7 @@
         """
         assert self.choices is not None
         if callable(self.choices):
+            # pylint: disable=E1102
             if getattr(self.choices, 'im_self', None) is self:
                 vocab = self.choices(form=form, **kwargs)
             elif support_args(self.choices, 'form', 'field'):
@@ -396,11 +398,11 @@
             else:
                 try:
                     vocab = self.choices(form=form, **kwargs)
-                    warn('[3.6]  %s: choices should now take '
+                    warn('[3.6] %s: choices should now take '
                          'the form and field as named arguments' % self,
                          DeprecationWarning)
                 except TypeError:
-                    warn('[3.3]  %s: choices should now take '
+                    warn('[3.3] %s: choices should now take '
                          'the form and field as named arguments' % self,
                          DeprecationWarning)
                     vocab = self.choices(req=form._cw, **kwargs)