Author: batiste.bieler
Date: Sun Feb 22 15:55:53 2009
New Revision: 361
Modified:
trunk/example/settings.py
trunk/pages/middleware.py
trunk/pages/templatetags/pages_tags.py
Log:
Remove the unused site middleware
Modified: trunk/example/settings.py
==============================================================================
--- trunk/example/settings.py (original)
+++ trunk/example/settings.py Sun Feb 22 15:55:53 2009
@@ -73,7 +73,7 @@
'django.middleware.common.CommonMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.doc.XViewMiddleware',
- 'pages.middleware.CurrentSiteMiddleware',
+ #'pages.middleware.LogSqlMiddleware',
)
ROOT_URLCONF = 'example.urls'
Modified: trunk/pages/middleware.py
==============================================================================
--- trunk/pages/middleware.py (original)
+++ trunk/pages/middleware.py Sun Feb 22 15:55:53 2009
@@ -2,29 +2,18 @@
from pages.utils import get_site_from_request
import settings
-class LazySite(object):
- def __get__(self, request, obj_type=None):
- if not hasattr(request, '_cached_site'):
- request._cached_site = get_site_from_request(request)
- return request._cached_site
-
-class CurrentSiteMiddleware(object):
-
- def process_request(self, request):
- request.__class__.site = LazySite()
- return None
-
- if settings.SQL_DEBUGGING:
- def process_response(self, request, response):
- from django import db
- import logging
- logging.basicConfig(filename="sql_log.txt",
level=logging.DEBUG,)
- logging.debug(request.path + " : " +
str(len(db.connection.queries)))
- a = []
- print "SQL requests : %d" % len(db.connection.queries)
- for q in db.connection.queries:
- a.append(q['sql'])
- a.sort()
- for q in a:
- logging.debug(q)
- return response
+class LogSqlMiddleware(object):
+
+ def process_response(self, request, response):
+ from django import db
+ import logging
+ logging.basicConfig(filename="sql_log.txt", level=logging.DEBUG,)
+ logging.debug(request.path + " : " +
str(len(db.connection.queries)))
+ a = []
+ print "SQL requests : %d" % len(db.connection.queries)
+ for q in db.connection.queries:
+ a.append(q['sql'])
+ a.sort()
+ for q in a:
+ logging.debug(q)
+ return response
Modified: trunk/pages/templatetags/pages_tags.py
==============================================================================
--- trunk/pages/templatetags/pages_tags.py (original)
+++ trunk/pages/templatetags/pages_tags.py Sun Feb 22 15:55:53 2009
@@ -40,7 +40,6 @@
render a nested list of all root's children pages"""
root = page.get_root()
request = context['request']
- site = request.site
children = get_page_children(page)
@@ -53,7 +52,6 @@
def pages_admin_menu(context, page, url='/admin/pages/page/', level=None):
"""Render the admin table of pages"""
request = context['request']
- site = request.site
if "tree_expanded" in request.COOKIES:
cookie_string = urllib.unquote(request.COOKIES['tree_expanded'])
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
