Changeset 1516

Timestamp:

12/11/06 13:28:52

Author:

fumanchu

Message:

2.x backport of [1369]; new Request.is_index attribute is None until set to True or False by mapPathToObject.

Files:

• branches/cherrypy-2.x/cherrypy/_cphttptools.py (modified) (4 diffs)

branches/cherrypy-2.x/cherrypy/_cphttptools.py

@@ -15 +15 @@
-class Request(object):
-    """An HTTP request."""
+    
+    is_index = None
-    
-    def __init__(self, remoteAddr, remotePort, remoteHost, scheme="http"):
@@ -296 +298 @@
-            defhandler = getattr(candidate, "default", None)
-            if callable(defhandler) and getattr(defhandler, 'exposed', False):
+                # See http://www.cherrypy.org/ticket/613
+                self.is_index = objectpath.endswith("/")
-                return defhandler, names[:i+1] + ["default"], names[i+1:-1]
-            
@@ -306 +310 @@
-                    # We found the extra ".index". Check if the original path
-                    # had a trailing slash (otherwise, do a redirect).
+                    self.is_index = True
-                    if not objectpath.endswith('/'):
-                        atoms = self.browser_url.split("?", 1)
@@ -312 +317 @@
-                            newUrl += "?" + atoms[0]
-                        raise cherrypy.HTTPRedirect(newUrl)
+                self.is_index = False
-                return candidate, names[:i+1], names[i+1:-1]
-