Commit 6a320cc1 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Fixed #21718 -- Renamed has_app to is_installed.

parent b57c48d0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ class Apps(object):
        app_models[model_name] = model
        self.clear_cache()

    def has_app(self, app_name):
    def is_installed(self, app_name):
        """
        Checks whether an application with this name exists in the registry.

+2 −2
Original line number Diff line number Diff line
@@ -160,10 +160,10 @@ class AdminSite(object):
        The default implementation checks that admin and contenttypes apps are
        installed, as well as the auth context processor.
        """
        if not apps.has_app('django.contrib.admin'):
        if not apps.is_installed('django.contrib.admin'):
            raise ImproperlyConfigured("Put 'django.contrib.admin' in your "
                "INSTALLED_APPS setting in order to use the admin application.")
        if not apps.has_app('django.contrib.contenttypes'):
        if not apps.is_installed('django.contrib.contenttypes'):
            raise ImproperlyConfigured("Put 'django.contrib.contenttypes' in "
                "your INSTALLED_APPS setting in order to use the admin application.")
        if 'django.contrib.auth.context_processors.auth' not in settings.TEMPLATE_CONTEXT_PROCESSORS:
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ from django.template import Library

register = Library()

if apps.has_app('django.contrib.staticfiles'):
if apps.is_installed('django.contrib.staticfiles'):
    from django.contrib.staticfiles.templatetags.staticfiles import static
else:
    from django.templatetags.static import static
+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ from django.utils.translation import ugettext_lazy

def skipUnlessAuthIsInstalled(func):
    return skipUnless(
        apps.has_app('django.contrib.auth'),
        apps.is_installed('django.contrib.auth'),
        "django.contrib.auth isn't installed")(func)


+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ class RedirectFallbackMiddleware(object):
    response_redirect_class = http.HttpResponsePermanentRedirect

    def __init__(self):
        if not apps.has_app('django.contrib.sites'):
        if not apps.is_installed('django.contrib.sites'):
            raise ImproperlyConfigured(
                "You cannot use RedirectFallbackMiddleware when "
                "django.contrib.sites is not installed."
Loading