Permalink
Browse files

magic-removal: Moved django.core.template to django.template and upda…

…ted dependencies.

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent b6954b5 commit 96116f60b4a763eaaaa76fcbeda28ef027f20630 @jkocherhans jkocherhans committed Jan 13, 2006
Showing with 2,678 additions and 101 deletions.
  1. +3 −3 django/conf/global_settings.py
  2. +3 −3 django/conf/project_template/settings.py
  3. +2 −2 django/contrib/admin/templatetags/admin_list.py
  4. +2 −1 django/contrib/admin/templatetags/admin_modify.py
  5. +1 −1 django/contrib/admin/templatetags/adminapplist.py
  6. +1 −1 django/contrib/admin/templatetags/adminmedia.py
  7. +1 −1 django/contrib/admin/templatetags/breadcrumbs.py
  8. +1 −1 django/contrib/admin/templatetags/log.py
  9. +2 −2 django/contrib/admin/views/doc.py
  10. +3 −2 django/contrib/admin/views/main.py
  11. +2 −1 django/contrib/admin/views/stages/add.py
  12. +2 −1 django/contrib/admin/views/stages/change.py
  13. +2 −2 django/contrib/admin/views/template.py
  14. +1 −1 django/contrib/comments/templatetags/comments.py
  15. +1 −1 django/contrib/markup/templatetags/markup.py
  16. +1 −1 django/contrib/syndication/feeds.py
  17. +1 −1 django/core/extensions.py
  18. +3 −3 django/core/template_loader.py
  19. +914 −0 django/template/__init__.py
  20. +487 −0 django/template/defaultfilters.py
  21. +783 −0 django/template/defaulttags.py
  22. +111 −0 django/template/loader.py
  23. +172 −0 django/template/loader_tags.py
  24. 0 django/template/loaders/__init__.py
  25. +41 −0 django/template/loaders/app_directories.py
  26. +25 −0 django/template/loaders/eggs.py
  27. +25 −0 django/template/loaders/filesystem.py
  28. +3 −3 django/templatetags/i18n.py
  29. +1 −1 django/utils/translation.py
  30. +2 −2 django/views/debug.py
  31. +1 −1 django/views/defaults.py
  32. +30 −24 django/views/generic/create_update.py
  33. +33 −27 django/views/generic/date_based.py
  34. +16 −13 django/views/generic/list_detail.py
  35. +1 −1 django/views/registration/passwords.py
  36. +1 −1 django/views/static.py
@@ -97,9 +97,9 @@
# See the comments in django/core/template/loader.py for interface
# documentation.
TEMPLATE_LOADERS = (
- 'django.core.template.loaders.filesystem.load_template_source',
- 'django.core.template.loaders.app_directories.load_template_source',
-# 'django.core.template.loaders.eggs.load_template_source',
+ 'django.template.loaders.filesystem.load_template_source',
+ 'django.template.loaders.app_directories.load_template_source',
+# 'django.template.loaders.eggs.load_template_source',
)
# List of processors used by DjangoContext to populate the context.
@@ -45,9 +45,9 @@
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
- 'django.core.template.loaders.filesystem.load_template_source',
- 'django.core.template.loaders.app_directories.load_template_source',
-# 'django.core.template.loaders.eggs.load_template_source',
+ 'django.template.loaders.filesystem.load_template_source',
+ 'django.template.loaders.app_directories.load_template_source',
+# 'django.template.loaders.eggs.load_template_source',
)
MIDDLEWARE_CLASSES = (
@@ -1,15 +1,15 @@
from django.contrib.admin.views.changelist import MAX_SHOW_ALL_ALLOWED, DEFAULT_RESULTS_PER_PAGE, ALL_VAR
from django.contrib.admin.views.changelist import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
from django.contrib.admin.views.changelist import IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, MONTHS
-from django.core import template
+from django import template
from django.core.exceptions import ObjectDoesNotExist
from django.db import models
from django.utils import dateformat
from django.utils.html import strip_tags, escape
from django.utils.text import capfirst
from django.utils.translation import get_date_formats
from django.conf.settings import ADMIN_MEDIA_PREFIX
-from django.core.template import Library
+from django.template import Library
register = Library()
@@ -1,4 +1,5 @@
-from django.core import template, template_loader
+from django import template
+from djang.core import template_loader
from django.utils.html import escape
from django.utils.text import capfirst
from django.utils.functional import curry
@@ -1,4 +1,4 @@
-from django.core import template
+from django import template
register = template.Library()
@@ -1,4 +1,4 @@
-from django.core.template import Library
+from django.template import Library
register = Library()
def admin_media_prefix():
@@ -1,4 +1,4 @@
-from django.core.template import Library
+from django.template import Library
register = Library()
@@ -1,5 +1,5 @@
from django.contrib.admin.models import LogEntry
-from django.core import template
+from django import template
register = template.Library()
@@ -1,11 +1,11 @@
-from django import templatetags
+from django import template, templatetags
from django.conf import settings
from django.contrib.admin.views.decorators import staff_member_required
from django.db import models
from django.core.extensions import DjangoContext, render_to_response
from django.core.exceptions import ViewDoesNotExist
from django.http import Http404
-from django.core import template, urlresolvers
+from django.core import urlresolvers
from django.contrib.admin import utils
from django.contrib.sites.models import Site
import inspect, os, re
@@ -1,8 +1,9 @@
# Generic admin views.
from django.conf import settings
from django.contrib.admin.views.decorators import staff_member_required
-from django.core import formfields, template
-from django.core.template import loader
+from django.core import formfields
+from django import template
+from django.template import loader
from django.db import models
from django.http import Http404
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
@@ -2,7 +2,8 @@
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.admin.views.main import get_model_and_app
from django.contrib.admin.views.stages.modify import render_change_form
-from django.core import formfields, template
+from django.core import formfields
+from django import template
from django.http import Http404
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
from django.core.extensions import DjangoContext as Context
@@ -1,5 +1,6 @@
from django.contrib.admin.views.main import get_model_and_app
-from django.core import formfields, template
+from django.core import formfields
+from django import template
from django.http import Http404
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
from django.core.extensions import DjangoContext as Context
@@ -1,7 +1,7 @@
from django.contrib.admin.views.decorators import staff_member_required
from django.core import formfields, validators
-from django.core import template
-from django.core.template import loader
+from django import template
+from django.template import loader
from django.core.extensions import DjangoContext, render_to_response
from django.contrib.sites.models import Site
from django.conf import settings
@@ -1,7 +1,7 @@
from django.contrib.comments.models import Comment, FreeComment
from django.contrib.comments.models import PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
from django.contrib.comments.models import MIN_PHOTO_DIMENSION, MAX_PHOTO_DIMENSION
-from django.core import template
+from django import template
from django.core.exceptions import ObjectDoesNotExist
from django.contrib.contenttypes.models import ContentType
import re
@@ -14,7 +14,7 @@
silently fail and return the un-marked-up text.
"""
-from django.core import template
+from django import template
register = template.Library()
@@ -1,5 +1,5 @@
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
-from django.core.template import Context, loader, Template, TemplateDoesNotExist
+from django.template import Context, loader, Template, TemplateDoesNotExist
from django.contrib.sites.models import Site
from django.utils import feedgenerator
from django.conf.settings import LANGUAGE_CODE, SETTINGS_MODULE
@@ -3,7 +3,7 @@
# for convenience's sake.
from django.core.exceptions import ImproperlyConfigured
-from django.core.template import Context, loader
+from django.template import Context, loader
from django.conf.settings import TEMPLATE_CONTEXT_PROCESSORS
from django.http import HttpResponse, Http404
@@ -1,7 +1,7 @@
# This module is DEPRECATED!
#
-# You should no longer be using django.core.template_loader.
+# You should no longer be using django.template_loader.
#
-# Use django.core.template.loader instead.
+# Use django.template.loader instead.
-from django.core.template.loader import *
+from django.template.loader import *
Oops, something went wrong.

0 comments on commit 96116f6

Please sign in to comment.