From 471bae17fad0d4864035c8dcd18a5ee6e705c510 Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Wed, 18 Jan 2006 19:02:35 +0000 Subject: [PATCH] magic-removal: Moved django.core.extensions to django.shortcuts and updated references. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2050 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/views/changelist.py | 2 +- django/contrib/admin/views/decorators.py | 2 +- django/contrib/admin/views/doc.py | 2 +- django/contrib/admin/views/main.py | 2 +- django/contrib/admin/views/template.py | 2 +- django/contrib/comments/views/comments.py | 2 +- django/contrib/comments/views/karma.py | 2 +- django/contrib/comments/views/userflags.py | 2 +- django/contrib/flatpages/views.py | 2 +- django/{core/extensions.py => shortcuts/__init__.py} | 0 django/views/auth/login.py | 2 +- django/views/generic/simple.py | 2 +- django/views/registration/passwords.py | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename django/{core/extensions.py => shortcuts/__init__.py} (100%) diff --git a/django/contrib/admin/views/changelist.py b/django/contrib/admin/views/changelist.py index e678f5fecc..702fb78972 100644 --- a/django/contrib/admin/views/changelist.py +++ b/django/contrib/admin/views/changelist.py @@ -6,7 +6,7 @@ from django.db.models.query import handle_legacy_orderlist from django.http import HttpResponse, HttpResponseRedirect from django.core.paginator import ObjectPaginator, InvalidPage from django.template import RequestContext as Context -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.utils.dates import MONTHS # The system will display a "Show all" link only if the total result count diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py index 3df034d4af..caa0d2ccae 100644 --- a/django/contrib/admin/views/decorators.py +++ b/django/contrib/admin/views/decorators.py @@ -1,7 +1,7 @@ from django import http, template from django.conf import settings from django.contrib.auth.models import User, SESSION_KEY -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.utils.translation import gettext_lazy import base64, datetime, md5 import cPickle as pickle diff --git a/django/contrib/admin/views/doc.py b/django/contrib/admin/views/doc.py index b300c419f9..6c921a4d83 100644 --- a/django/contrib/admin/views/doc.py +++ b/django/contrib/admin/views/doc.py @@ -3,7 +3,7 @@ from django.template import RequestContext 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 render_to_response +from django.shortcuts import render_to_response from django.core.exceptions import ViewDoesNotExist from django.http import Http404 from django.core import urlresolvers diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index d7727a4f80..430bb9d9a8 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -2,7 +2,7 @@ from django import forms, template from django.conf import settings from django.contrib.admin.views.decorators import staff_member_required from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied -from django.core.extensions import get_object_or_404, render_to_response +from django.shortcuts import get_object_or_404, render_to_response from django.db import models from django.db.models.fields import BoundField, BoundFieldLine, BoundFieldSet from django.http import Http404, HttpResponse, HttpResponseRedirect diff --git a/django/contrib/admin/views/template.py b/django/contrib/admin/views/template.py index 3dbfb407a8..47e6d04e68 100644 --- a/django/contrib/admin/views/template.py +++ b/django/contrib/admin/views/template.py @@ -2,7 +2,7 @@ from django.contrib.admin.views.decorators import staff_member_required from django.core import validators from django import template, forms from django.template import loader -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.contrib.sites.models import Site from django.conf import settings diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py index daa2a0ec7d..e44cc2924c 100644 --- a/django/contrib/comments/views/comments.py +++ b/django/contrib/comments/views/comments.py @@ -3,7 +3,7 @@ from django import forms from django.core.mail import mail_admins, mail_managers from django.http import Http404 from django.core.exceptions import ObjectDoesNotExist -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.template import RequestContext from django.contrib.auth.models import SESSION_KEY from django.contrib.comments.models import Comment, FreeComment, PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC diff --git a/django/contrib/comments/views/karma.py b/django/contrib/comments/views/karma.py index 42774cc790..8667850675 100644 --- a/django/contrib/comments/views/karma.py +++ b/django/contrib/comments/views/karma.py @@ -1,5 +1,5 @@ from django.http import Http404 -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.template import RequestContext from django.models.comments import comments, karma diff --git a/django/contrib/comments/views/userflags.py b/django/contrib/comments/views/userflags.py index 3132926898..e6fa88ff45 100644 --- a/django/contrib/comments/views/userflags.py +++ b/django/contrib/comments/views/userflags.py @@ -1,4 +1,4 @@ -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.template import RequestContext from django.http import Http404 from django.models.comments import comments, moderatordeletions, userflags diff --git a/django/contrib/flatpages/views.py b/django/contrib/flatpages/views.py index cb15d871b9..fac4ab0c41 100644 --- a/django/contrib/flatpages/views.py +++ b/django/contrib/flatpages/views.py @@ -1,6 +1,6 @@ from django.contrib.flatpages.models import FlatPage from django.template import loader, RequestContext -from django.core.extensions import get_object_or_404 +from django.shortcuts import get_object_or_404 from django.http import HttpResponse from django.conf import settings diff --git a/django/core/extensions.py b/django/shortcuts/__init__.py similarity index 100% rename from django/core/extensions.py rename to django/shortcuts/__init__.py diff --git a/django/views/auth/login.py b/django/views/auth/login.py index 0712a87433..926ed3f6d5 100644 --- a/django/views/auth/login.py +++ b/django/views/auth/login.py @@ -1,6 +1,6 @@ from django.parts.auth.formfields import AuthenticationForm from django import forms -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.template import RequestContext from django.contrib.auth.models import SESSION_KEY from django.contrib.sites.models import Site diff --git a/django/views/generic/simple.py b/django/views/generic/simple.py index bb64c5c968..4571ef8605 100644 --- a/django/views/generic/simple.py +++ b/django/views/generic/simple.py @@ -1,4 +1,4 @@ -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.template import RequestContext from django.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone diff --git a/django/views/registration/passwords.py b/django/views/registration/passwords.py index b5fd2daa64..6379000587 100644 --- a/django/views/registration/passwords.py +++ b/django/views/registration/passwords.py @@ -1,6 +1,6 @@ from django import forms from django.core import validators -from django.core.extensions import render_to_response +from django.shortcuts import render_to_response from django.template import Context, RequestContext, loader from django.contrib.auth.models import User from django.contrib.sites.models import Site