mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

Moved apps back in the toplevel django namespace.

Browse Source 
Reverted 4a56a93cc4.
This commit is contained in:
Aymeric Augustin
2013-12-22 11:35:17 +01:00
parent 99bd39ef6e
commit 2fef9e5375
95 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django/template/base.py
View File

@@ -5,8 +5,8 @@ from functools import partial
from importlib import import_module
from inspect import getargspec, getcallargs
from django.apps import app_cache
from django.conf import settings
from django.core.apps import app_cache
from django.template.context import (BaseContext, Context, RequestContext, # NOQA: imported for backwards compatibility
ContextPopException)
from django.utils.itercompat import is_iterable

2
django/template/loaders/app_directories.py
View File

@@ -6,8 +6,8 @@ packages.
import os
import sys
from django.apps import app_cache
from django.conf import settings
from django.core.apps import app_cache
from django.template.base import TemplateDoesNotExist
from django.template.loader import BaseLoader
from django.utils._os import safe_join

2
django/template/loaders/eggs.py
View File

@@ -6,8 +6,8 @@ try:
except ImportError:
resource_string = None
from django.apps import app_cache
from django.conf import settings
from django.core.apps import app_cache
from django.template.base import TemplateDoesNotExist
from django.template.loader import BaseLoader
from django.utils import six