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

Fixed #12888. Fixed a typo in some related object error messages. Thanks, nessita. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2010-02-23 16:09:39 +00:00
parent 06a880f730
commit 10b1871441
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/models/fields/related.py
View File

@ -227,7 +227,7 @@ class SingleRelatedObjectDescriptor(object):
value._state.db = router.db_for_write(value.__class__, instance=instance) value._state.db = router.db_for_write(value.__class__, instance=instance)
elif value._state.db is not None and instance._state.db is not None: elif value._state.db is not None and instance._state.db is not None:
if not router.allow_relation(value, instance): if not router.allow_relation(value, instance):
raise ValueError('Cannot assign "%r": instance is on database "%s", value is is on database "%s"' % raise ValueError('Cannot assign "%r": instance is on database "%s", value is on database "%s"' %
(value, instance._state.db, value._state.db)) (value, instance._state.db, value._state.db))
# Set the value of the related field to the value of the related object's related field # Set the value of the related field to the value of the related object's related field
@ -299,7 +299,7 @@ class ReverseSingleRelatedObjectDescriptor(object):
value._state.db = router.db_for_write(value.__class__, instance=instance) value._state.db = router.db_for_write(value.__class__, instance=instance)
elif value._state.db is not None and instance._state.db is not None: elif value._state.db is not None and instance._state.db is not None:
if not router.allow_relation(value, instance): if not router.allow_relation(value, instance):
raise ValueError('Cannot assign "%r": instance is on database "%s", value is is on database "%s"' % raise ValueError('Cannot assign "%r": instance is on database "%s", value is on database "%s"' %
(value, instance._state.db, value._state.db)) (value, instance._state.db, value._state.db))
# If we're setting the value of a OneToOneField to None, we need to clear # If we're setting the value of a OneToOneField to None, we need to clear
@ -521,7 +521,7 @@ def create_many_related_manager(superclass, rel=False):
for obj in objs: for obj in objs:
if isinstance(obj, self.model): if isinstance(obj, self.model):
if not router.allow_relation(obj, self.instance): if not router.allow_relation(obj, self.instance):
raise ValueError('Cannot add "%r": instance is on database "%s", value is is on database "%s"' % raise ValueError('Cannot add "%r": instance is on database "%s", value is on database "%s"' %
(obj, self.instance._state.db, obj._state.db)) (obj, self.instance._state.db, obj._state.db))
new_ids.add(obj.pk) new_ids.add(obj.pk)
elif isinstance(obj, Model): elif isinstance(obj, Model):