Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Small formatting change to validation error in [516], to be consisten…

…t with other validation errors.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@517 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f21ff30b104ef1eedcfebd230a98fef4b6cc7ebd 1 parent 7d374ad
@adrianholovaty adrianholovaty authored
Showing with 7 additions and 5 deletions.
  1. +7 −5 django/core/meta/fields.py
View
12 django/core/meta/fields.py
@@ -587,11 +587,11 @@ def get_manipulator_field_objs(self):
else:
choices = self.get_choices(include_blank=False)
return [curry(formfields.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]
-
+
def get_m2m_db_table(self, original_opts):
"Returns the name of the many-to-many 'join' table."
return '%s_%s' % (original_opts.db_table, self.name)
-
+
def isValidIDList(self, field_data, all_data):
"Validates that the value is a valid list of foreign keys"
mod = self.rel.to.get_model_module()
@@ -603,9 +603,11 @@ def isValidIDList(self, field_data, all_data):
objects = mod.get_in_bulk(pks)
if len(objects) != len(pks):
badkeys = [k for k in pks if k not in objects]
- raise validators.ValidationError, "Please enter valid %s IDs (the value%s %r %s invalid)" % \
- (self.verbose_name, len(badkeys) > 1 and 's' or '', len(badkeys) == 1 and badkeys[0] or tuple(badkeys), len(badkeys) == 1 and "is" or "are")
-
+ raise validators.ValidationError, "Please enter valid %s IDs. The value%s %r %s invalid." % \
+ (self.verbose_name, len(badkeys) > 1 and 's' or '',
+ len(badkeys) == 1 and badkeys[0] or tuple(badkeys),
+ len(badkeys) == 1 and "is" or "are")
+
class OneToOneField(IntegerField):
def __init__(self, to, to_field=None, rel_name=None, **kwargs):
kwargs['name'] = kwargs.get('name', 'id')

0 comments on commit f21ff30

Please sign in to comment.
Something went wrong with that request. Please try again.