From 17c66e6fe77bc5eb2bd9e6f8f032a105d3cac3d7 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 22 Dec 2013 17:07:52 +0100
Subject: [PATCH] Renamed has_model to get_registered_models.

That matches its return type better.
---
 django/apps/cache.py               | 2 +-
 django/db/models/base.py           | 4 ++--
 django/db/models/fields/related.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/django/apps/cache.py b/django/apps/cache.py
index e7adffecdb..6d8988ad70 100644
--- a/django/apps/cache.py
+++ b/django/apps/cache.py
@@ -310,7 +310,7 @@ class AppCache(object):
         app_config = self.app_configs.get(app_name.rpartition(".")[2])
         return app_config is not None and app_config.name == app_name:
 
-    def has_model(self, app_label, model_name):
+    def get_registered_model(self, app_label, model_name):
         """
         Returns the model class if one is registered and None otherwise.
 
diff --git a/django/db/models/base.py b/django/db/models/base.py
index 3ae0fe34bd..85e4be870b 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -151,7 +151,7 @@ class ModelBase(type):
                 new_class._base_manager = new_class._base_manager._copy_to_model(new_class)
 
         # Bail out early if we have already created this class.
-        m = new_class._meta.app_cache.has_model(new_class._meta.app_label, name)
+        m = new_class._meta.app_cache.get_registered_model(new_class._meta.app_label, name)
         if m is not None:
             return m
 
@@ -278,7 +278,7 @@ class ModelBase(type):
         # the first time this model tries to register with the framework. There
         # should only be one class for each model, so we always return the
         # registered version.
-        return new_class._meta.app_cache.has_model(new_class._meta.app_label, name)
+        return new_class._meta.app_cache.get_registered_model(new_class._meta.app_label, name)
 
     def copy_managers(cls, base_managers):
         # This is in-place sorting of an Options attribute, but that's fine.
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py
index 0218c8c693..d6d84e1b23 100644
--- a/django/db/models/fields/related.py
+++ b/django/db/models/fields/related.py
@@ -68,7 +68,7 @@ def add_lazy_relation(cls, field, relation, operation):
     # string right away. If get_model returns None, it means that the related
     # model isn't loaded yet, so we need to pend the relation until the class
     # is prepared.
-    model = cls._meta.app_cache.has_model(app_label, model_name)
+    model = cls._meta.app_cache.get_registered_model(app_label, model_name)
     if model:
         operation(field, model, cls)
     else: