mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: changed explicit settings import to qualified settings import in django.contrib.flatpages

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer 2006-01-16 15:04:06 +00:00
parent 0aca6e1d1d
commit abeb5681b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/flatpages/middleware.py
View File

@ -1,6 +1,6 @@
from django.contrib.flatpages.views import flatpage from django.contrib.flatpages.views import flatpage
from django.http import Http404 from django.http import Http404
from django.conf.settings import DEBUG from django.conf import settings
class FlatpageFallbackMiddleware: class FlatpageFallbackMiddleware:
def process_response(self, request, response): def process_response(self, request, response):
@ -13,6 +13,6 @@ class FlatpageFallbackMiddleware:
except Http404: except Http404:
return response return response
except: except:
if DEBUG: if settings.DEBUG:
raise raise
return response return response

4
django/contrib/flatpages/views.py
View File

@ -2,7 +2,7 @@ from django.contrib.flatpages.models import FlatPage
from django.template import loader, RequestContext from django.template import loader, RequestContext
from django.core.extensions import get_object_or_404 from django.core.extensions import get_object_or_404
from django.http import HttpResponse from django.http import HttpResponse
from django.conf.settings import SITE_ID from django.conf import settings
DEFAULT_TEMPLATE = 'flatpages/default' DEFAULT_TEMPLATE = 'flatpages/default'
@ -19,7 +19,7 @@ def flatpage(request, url):
""" """
if not url.startswith('/'): if not url.startswith('/'):
url = "/" + url url = "/" + url
f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=SITE_ID) f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)
# If registration is required for accessing this page, and the user isn't # If registration is required for accessing this page, and the user isn't
# logged in, redirect to the login page. # logged in, redirect to the login page.
if f.registration_required and request.user.is_anonymous(): if f.registration_required and request.user.is_anonymous():