# HG changeset patch # User k0s # Date 1254950773 14400 # Node ID 645aa0f3279fd7de742149779acea43f5093c279 # Parent fbf8f198ef678e8e981612e9094363f8e9b5afe4 userland refactoring...still lives on request, sadly, but better diff -r fbf8f198ef67 -r 645aa0f3279f bitsyblog/bitsyblog.py --- a/bitsyblog/bitsyblog.py Wed Oct 07 17:19:47 2009 -0400 +++ b/bitsyblog/bitsyblog.py Wed Oct 07 17:26:13 2009 -0400 @@ -146,7 +146,7 @@ def get_user_space(self, user, path, request): """returns a part of the user space""" - request.user = self.users[user] # user whose blog is viewed +# request.user = self.users[user] # user whose blog is viewed check = self.check_user(user, request) # is this the authenticated user? feed = None # not an rss/atom feed by default (flag) @@ -234,8 +234,6 @@ ### user space user, path = self.userpath(request) - if user not in self.users: - return exc.HTTPNotFound("No blog found for %s" % user) return self.get_user_space(user, path, request) @@ -248,10 +246,6 @@ # find user + path user, path = self.userpath(request) - if user not in self.users: - return exc.HTTPNotFound("No blog found for %s" % user) - request.user = self.users[user] - check = self.check_user(user) if check is not None: return check @@ -384,7 +378,11 @@ path = request.path_info.strip('/').split('/') name = path[0] path = path[1:] - if not name: + if name: + if name not in self.users: + exc.HTTPNotFound("No blog found for %s" % user) + request.user = self.users[name] + else: name = None return name, path @@ -861,6 +859,7 @@ path = request.path_info.strip('/').split('/') if path == ['']: path = [] + request.user = self.users[self.user] return self.user, path def user_url(self, request, user, *args, **kw):