diff options
| -rw-r--r-- | django/db/models/options.py | 10 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py index 368ac621e1..1406ab9441 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -651,12 +651,12 @@ class Options(object): def get_base_chain(self, model): """ - Returns a list of parent classes leading to 'model' (order from closet - to most distant ancestor). This has to handle the case were 'model' is - a grandparent or even more distant relation. + Return a list of parent classes leading to `model` (ordered from + closest to most distant ancestor). This has to handle the case where + `model` is a grandparent or even more distant relation. """ if not self.parents: - return None + return [] if model in self.parents: return [model] for parent in self.parents: @@ -664,7 +664,7 @@ class Options(object): if res: res.insert(0, parent) return res - return None + return [] def get_parent_list(self): """ diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 40ec57f9de..e6af36b4e9 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -950,7 +950,7 @@ class Query(object): if model in seen: return seen[model] chain = opts.get_base_chain(model) - if chain is None: + if not chain: return alias curr_opts = opts for int_model in chain: |