Changeset 1505

Timestamp:

03/25/08 14:11:29 (7 months ago)

Author:

JensDiemer

Message:

work-a-round for ticket:87 with the new PyLucidCommonMiddleware?.

Location:

trunk/pylucid

Files:

• PyLucid/install/BaseInstall.py (modified) (2 diffs)
• PyLucid/middlewares/common.py (added)
• PyLucid/middlewares/pagestats.py (modified) (4 diffs)
• PyLucid/settings_example.py (modified) (1 diff)
• PyLucid/templates_PyLucid/install_info.html (added)
• tests/install_section.py (added)

trunk/pylucid/PyLucid/install/BaseInstall.py

@@ -87 +87 @@
 """
 
+def get_base_context(request):
+    """
+    Build a base context.
+    Used in BaseInstall and PyLucidCommonMiddleware.
+    """
+    media_url = posixpath.join(
+        settings.MEDIA_URL, settings.PYLUCID_MEDIA_DIR, ""
+    ) # With appended slash, for backward compatible
+    context = {
+        "output": "",
+        "request": request,
+        "PyLucid_media_url": media_url,
+        "version": PYLUCID_VERSION_STRING,
+        "current_working_dir": os.getcwd(),
+    }
+    return context
+
+
+
 class BaseInstall(object):
     """
@@ -108 +127 @@
         self.request = request
 
-        media_url = posixpath.join(
-            settings.MEDIA_URL, settings.PYLUCID_MEDIA_DIR, ""
-        ) # With appended slash, for backward compatible
-        self.context = {
-            "output": "",
-            "request": request,
-            "PyLucid_media_url": media_url,
-            "version": PYLUCID_VERSION_STRING,
-            "current_working_dir": os.getcwd(),
-        }
+        self.context = get_base_context(request)
+
         self.page_msg = PageMessages(self.context)
         self.context["page_msg"] = self.page_msg

trunk/pylucid/PyLucid/middlewares/pagestats.py

@@ -21 +21 @@
 """
 
-from operator import add
 from time import time
 
 from django.db import connection
-from django.core.exceptions import ImproperlyConfigured
 
 from PyLucid.template_addons.filters import human_duration
@@ -39 +37 @@
 )
 
+class PageStatsMiddleware(object):
+    def process_request(self, request):
+        """
+        save start time and database connections count.
+        """
+        self.start_time = time()
+        # get number of db queries before we do anything
+        self.old_queries = len(connection.queries)
 
-class PageStatsMiddleware(object):
-    def process_view(self, request, view_func, view_args, view_kwargs):
-        start_time = time()
-
-        # get number of db queries before we do anything
-        old_queries = len(connection.queries)
-
-        try:
-            # start the view
-            response = view_func(request, *view_args, **view_kwargs)
-        except AttributeError, e:
-            if str(e)== "'WSGIRequest' object has no attribute 'user'":
-                from django.conf import settings
-                if not 'django.contrib.sessions.middleware.SessionMiddleware' \
-                    in settings.MIDDLEWARE_CLASSES or not \
-                    'django.contrib.auth.middleware.AuthenticationMiddleware' \
-                    in settings.MIDDLEWARE_CLASSES:
-                    msg = (
-                        "You must include the session middleware and the"
-                        " authentication middleware in your settings.py"
-                        " after a syncdb. --- The original error message"
-                        " was: %s"
-                    ) % e
-                    raise ImproperlyConfigured(msg)
-            raise
-
+    def process_response(self, request, response):
+        """
+        calculate the statistic and replace it into the html page.
+        """
         # Put only the statistic into HTML pages
         if not "html" in response._headers["content-type"][1]:
@@ -73 +57 @@
         # compute the db time for the queries just run
         # FIXME: In my shared webhosting environment the queries is always = 0
-        queries = len(connection.queries) - old_queries
+        queries = len(connection.queries) - self.old_queries
 
-        total_time = human_duration(time() - start_time)
+        total_time = human_duration(time() - self.start_time)
         overall_time = human_duration(time() - start_overall)
 
@@ -85 +69 @@
         }
 
-        try:
-            response.content = response.content.replace(TAG, stat_info)
-        except UnicodeError:
+        content = response.content
+        if not isinstance(content, unicode):
             # FIXME: In my shared webhosting environment is response.content a
             # string and not unicode. Why?
             from django.utils.encoding import force_unicode
             try:
-                response.content = force_unicode(response.content)\
-                                                    .replace(TAG, stat_info)
+                content = force_unicode(content)
             except:
-                pass
+                return response
+
+        # insert the page statistic
+        new_content = content.replace(TAG, stat_info)
+        response.content = new_content
 
         return response

trunk/pylucid/PyLucid/settings_example.py

@@ -83 +83 @@
 # response phase the middleware will be applied in reverse order.
 #
-# !!! IMPORTANT !!!
-#  * In the first install phase (befor the database tables exists) the
-#    'SessionMiddleware' and 'AuthenticationMiddleware' must be deactivated!
-#  * After "syncdb" you must activate 'SessionMiddleware' and
-#    'AuthenticationMiddleware'!
-#  * The DebugPageCache should be *never* activated. Only for dev debugging.
-# !!! IMPORTANT !!!
-#
 MIDDLEWARE_CLASSES = (
-    # DebugPageCache normaly not used.
-#    'PyLucid.middlewares.page_cache_debug.DebugPageCache',
-
-    # Activate Session- and Authentication-Middleware after 'syncdb' :
-    # -------------------------------------------------------------------------
-#    'django.contrib.sessions.middleware.SessionMiddleware',
-#    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    # -------------------------------------------------------------------------
-
-    'django.middleware.locale.LocaleMiddleware',
+    # PyLucidCommonMiddleware loads the django middlewares:
+    #    - 'django.contrib.sessions.middleware.SessionMiddleware'
+    #    - 'django.contrib.auth.middleware.AuthenticationMiddleware'
+    #    - 'django.middleware.locale.LocaleMiddleware'
+    'PyLucid.middlewares.common.PyLucidCommonMiddleware',
+
     'django.middleware.common.CommonMiddleware',
     'django.middleware.doc.XViewMiddleware',