summaryrefslogtreecommitdiff
path: root/django/contrib/sitemaps
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 12:25:17 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-12-24 12:25:17 +0100
commit1716b7ce5a02b2a77188dfea2d41e25dfa58821c (patch)
treef3422c0d6725f45756a3b9deb32406d319b8a72e /django/contrib/sitemaps
parente9e522a8e7455900a775678e5d6bc518a289b8d1 (diff)
downloaddjango-1716b7ce5a02b2a77188dfea2d41e25dfa58821c.tar.gz
Renamed AppCache to Apps.
Also renamed app_cache to apps and "app cache" to "app registry". Deprecated AppCache.app_cache_ready() in favor of Apps.ready().
Diffstat (limited to 'django/contrib/sitemaps')
-rw-r--r--django/contrib/sitemaps/tests/test_flatpages.py4
-rw-r--r--django/contrib/sitemaps/tests/test_http.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/sitemaps/tests/test_flatpages.py b/django/contrib/sitemaps/tests/test_flatpages.py
index 90172e558f..4e9deb8de4 100644
--- a/django/contrib/sitemaps/tests/test_flatpages.py
+++ b/django/contrib/sitemaps/tests/test_flatpages.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from unittest import skipUnless
-from django.apps import app_cache
+from django.apps import apps
from django.conf import settings
from .base import SitemapTestsBase
@@ -10,7 +10,7 @@ from .base import SitemapTestsBase
class FlatpagesSitemapTests(SitemapTestsBase):
- @skipUnless(app_cache.has_app('django.contrib.flatpages'),
+ @skipUnless(apps.has_app('django.contrib.flatpages'),
"django.contrib.flatpages app not installed.")
def test_flatpage_sitemap(self):
"Basic FlatPage sitemap test"
diff --git a/django/contrib/sitemaps/tests/test_http.py b/django/contrib/sitemaps/tests/test_http.py
index 583b0b44bf..e8c3409c74 100644
--- a/django/contrib/sitemaps/tests/test_http.py
+++ b/django/contrib/sitemaps/tests/test_http.py
@@ -4,7 +4,7 @@ import os
from datetime import date
from unittest import skipUnless
-from django.apps import app_cache
+from django.apps import apps
from django.conf import settings
from django.contrib.sitemaps import Sitemap, GenericSitemap
from django.contrib.sites.models import Site
@@ -118,7 +118,7 @@ class HTTPSitemapTests(SitemapTestsBase):
""" % date.today()
self.assertXMLEqual(response.content.decode('utf-8'), expected_content)
- @skipUnless(app_cache.has_app('django.contrib.sites'),
+ @skipUnless(apps.has_app('django.contrib.sites'),
"django.contrib.sites app not installed.")
def test_sitemap_get_urls_no_site_1(self):
"""