Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #14870 -- don't catch AttributeErrors in database router method…

…s, instead check that the method itself exists. Thanks to jonash for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2a463231248df5eacaf0d88af45d7bc4f462a88e 1 parent b8c368f
@alex alex authored
Showing with 17 additions and 9 deletions.
  1. +17 −9 django/db/utils.py
View
26 django/db/utils.py
@@ -5,6 +5,7 @@
from django.core.exceptions import ImproperlyConfigured
from django.utils.importlib import import_module
+
DEFAULT_DB_ALIAS = 'default'
# Define some exceptions that mirror the PEP249 interface.
@@ -125,12 +126,15 @@ def _route_db(self, model, **hints):
chosen_db = None
for router in self.routers:
try:
- chosen_db = getattr(router, action)(model, **hints)
- if chosen_db:
- return chosen_db
+ method = getattr(router, action)
except AttributeError:
# If the router doesn't have a method, skip to the next one.
pass
+ else:
+ chosen_db = method(model, **hints
+ )
+ if chosen_db:
+ return chosen_db
try:
return hints['instance']._state.db or DEFAULT_DB_ALIAS
except KeyError:
@@ -143,21 +147,25 @@ def _route_db(self, model, **hints):
def allow_relation(self, obj1, obj2, **hints):
for router in self.routers:
try:
- allow = router.allow_relation(obj1, obj2, **hints)
- if allow is not None:
- return allow
+ method = router.allow_relation
except AttributeError:
# If the router doesn't have a method, skip to the next one.
pass
+ else:
+ allow = method(obj1, obj2, **hints)
+ if allow is not None:
+ return allow
return obj1._state.db == obj2._state.db
def allow_syncdb(self, db, model):
for router in self.routers:
try:
- allow = router.allow_syncdb(db, model)
- if allow is not None:
- return allow
+ method = router.allow_syncdb
except AttributeError:
# If the router doesn't have a method, skip to the next one.
pass
+ else:
+ allow = method(db, model)
+ if allow is not None:
+ return allow
return True
Please sign in to comment.
Something went wrong with that request. Please try again.