Updates to gilbert. Reorganizing imports and removing support for python < 2.5.4.

[philo.git] / middleware.py

diff --git a/middleware.py b/middleware.py
index 5bcd569..5ec3e77 100644 (file)
--- a/middleware.py
+++ b/middleware.py
@@ -25,18 +25,17 @@ class LazyNode(object):
                        except Node.DoesNotExist:
                                node = None
                        else:
                        except Node.DoesNotExist:
                                node = None
                        else:

-                               if subpath and not node.handles_subpath(subpath):
-                                       node = None
-                       
-                       if node:

                                if subpath is None:
                                        subpath = ""
                                subpath = "/" + subpath
                                
                                if subpath is None:
                                        subpath = ""
                                subpath = "/" + subpath
                                

-                               if trailing_slash and subpath[-1] != "/":
-                                       subpath += "/"
-                               
-                               node.subpath = subpath
+                               if not node.handles_subpath(subpath):
+                                       node = None
+                               else:
+                                       if trailing_slash and subpath[-1] != "/":
+                                               subpath += "/"
+                                       
+                                       node.subpath = subpath

                        
                        request._found_node = node
                
                        
                        request._found_node = node