Changeset 81

Timestamp:

10/15/07 11:43:15 (15 months ago)

Author:

steadicat

Message:

Fixed an indentation error and added a check for backends which set an empty path (e.g. runfcgi).

Files:

• django/trunk/middleware/urlmiddleware.py (modified) (5 diffs)

django/trunk/middleware/urlmiddleware.py

@@ -23 +23 @@
 Changelog
 
+1.3.2
+Fixed an indentation issue. Added a check for those backends
+which set an empty path (e.g. runfcgi).
+
 1.3.1
-Added support for running in a test suite (doesn't assume that
-HTTP_HOST is set)
+Added support for running in a test
+suite (doesn't assume that HTTP_HOST is set)
 
 1.3
@@ -44 +48 @@
 First release.
 """
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 __license__ = "Python"
 __copyright__ = "Copyright (C) 2006-2007, Stefano J. Attardi"
@@ -62 +66 @@
         # Change the language setting for the current page
         if "lang" in request.GET and check_for_language(request.GET["lang"]):
-            if hasattr(request, 'session'):
-                request.session['django_language'] = request.GET["lang"]
+            if hasattr(request, "session"):
+                request.session["django_language"] = request.GET["lang"]
             else:
-                request.COOKIES['django_language'] = request.GET["lang"]
+                request.COOKIES["django_language"] = request.GET["lang"]
+
+        # work-around for runfcgi
+        if request.path == "": request.path = "/"
 
         # Check for a redirect based on settings.APPEND_SLASH and settings.PREPEND_WWW
-        old_url = [request.META.get('HTTP_HOST', 'localhost'), request.path]
+        old_url = [request.META.get("HTTP_HOST", "localhost"), request.path]
         new_url = old_url[:]
 
         # if REMOVE_WWW is True, remove the www. from the urls if necessary
-        if hasattr(settings, "REMOVE_WWW") and settings.REMOVE_WWW and old_url[0].startswith('www.'):
+        if hasattr(settings, "REMOVE_WWW") and settings.REMOVE_WWW and old_url[0].startswith("www."):
             new_url[0] = old_url[0][4:]
 
         if hasattr(settings, "APPEND_SLASH") and not settings.APPEND_SLASH:
             # if the url is not found, try with(out) the trailing slash
-            if not self._urlExists(old_url[1]):
+            if old_url[1] != "/" and not self._urlExists(old_url[1]):
 
                 if old_url[1][-1] == "/":
@@ -87 +94 @@
                     new_url[1] = other
 
-            if new_url != old_url:
-                # Redirect
-                newurl = "%s://%s%s" % (os.environ.get('HTTPS') == 'on' and 'https' or 'http', new_url[0], new_url[1])
-                if request.GET:
-                    newurl += '?' + request.GET.urlencode()
-                return HttpResponseRedirect(newurl)
+        if new_url != old_url:
+            # Redirect
+            newurl = "%s://%s%s" % (os.environ.get("HTTPS") == "on" and "https" or "http", new_url[0], new_url[1])
+            if request.GET:
+                newurl += "?" + request.GET.urlencode()
+
+            return HttpResponseRedirect(newurl)
 
         return None
@@ -100 +108 @@
         # Change the language setting for future pages
         if "lang" in request.GET and check_for_language(request.GET["lang"]):
-            if 'sessionid' in request.COOKIES:
-                request.session['django_language'] = request.GET["lang"]
+            if "sessionid" in request.COOKIES:
+                request.session["django_language"] = request.GET["lang"]
             else:
-                response.set_cookie('django_language', request.GET["lang"])
+                response.set_cookie("django_language", request.GET["lang"])
 
         return response