4 files changed, 7 insertions, 13 deletions
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index 7afb11ef34..75f2c13060 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -185,11 +185,11 @@ class ModelDetailView(BaseAdminDocsView):
     def get_context_data(self, **kwargs):
         # Get the model class.
         try:
-            apps.get_app_config(self.kwargs['app_label'])
+            app_config = apps.get_app_config(self.kwargs['app_label'])
         except LookupError:
             raise Http404(_("App %(app_label)r not found") % self.kwargs)
         try:
-            model = apps.get_model(self.kwargs['app_label'], self.kwargs['model_name'])
+            model = app_config.get_model(self.kwargs['model_name'])
         except LookupError:
             raise Http404(_("Model %(model_name)r not found in app %(app_label)r") % self.kwargs)
 
diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py
index 77b2482e31..9fd46814b2 100644
--- a/django/contrib/auth/__init__.py
+++ b/django/contrib/auth/__init__.py
@@ -1,6 +1,7 @@
 import inspect
 import re
 
+from django.apps import apps as django_apps
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.utils.module_loading import import_by_path
@@ -123,17 +124,12 @@ def get_user_model():
     """
     Returns the User model that is active in this project.
     """
-    from django.apps import apps
-
     try:
-        app_label, model_name = settings.AUTH_USER_MODEL.split('.')
+        return django_apps.get_model(settings.AUTH_USER_MODEL)
     except ValueError:
         raise ImproperlyConfigured("AUTH_USER_MODEL must be of the form 'app_label.model_name'")
-    try:
-        user_model = apps.get_model(app_label, model_name)
     except LookupError:
         raise ImproperlyConfigured("AUTH_USER_MODEL refers to model '%s' that has not been installed" % settings.AUTH_USER_MODEL)
-    return user_model
 
 
 def get_user(request):
diff --git a/django/contrib/auth/checks.py b/django/contrib/auth/checks.py
index f16da4dd47..ec55c29665 100644
--- a/django/contrib/auth/checks.py
+++ b/django/contrib/auth/checks.py
@@ -2,16 +2,14 @@
 from __future__ import unicode_literals
 
 from django.apps import apps
+from django.conf import settings
 from django.core import checks
 
 
 def check_user_model(**kwargs):
-    from django.conf import settings
-
     errors = []
-    app_name, model_name = settings.AUTH_USER_MODEL.split('.')
 
-    cls = apps.get_model(app_name, model_name)
+    cls = apps.get_model(settings.AUTH_USER_MODEL)
 
     # Check that REQUIRED_FIELDS is a list
     if not isinstance(cls.REQUIRED_FIELDS, (list, tuple)):
diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py
index 165f2b6574..c124634088 100644
--- a/django/contrib/comments/views/comments.py
+++ b/django/contrib/comments/views/comments.py
@@ -49,7 +49,7 @@ def post_comment(request, next=None, using=None):
     if ctype is None or object_pk is None:
         return CommentPostBadRequest("Missing content_type or object_pk field.")
     try:
-        model = apps.get_model(*ctype.split(".", 1))
+        model = apps.get_model(ctype)
         target = model._default_manager.using(using).get(pk=object_pk)
     except TypeError:
         return CommentPostBadRequest(