aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/util.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index f5709123..6551a3cc 100644
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -38,19 +38,12 @@ def setup_user_in_request(request):
return
user = None
+ user = request.db.User.one(
+ {'_id': mongokit.ObjectId(request.session['user_id'])})
- try:
- user = request.db.User.one(
- {'_id': mongokit.ObjectId(request.session['user_id'])})
-
- if not user:
- # Something's wrong... this user doesn't exist? Invalidate
- # this session.
- request.session.invalidate()
-
- except mongokit.MultipleResultsFound:
- # Something's wrong... we shouldn't have multiple users with
- # the same user id. Invalidate this session.
+ if not user:
+ # Something's wrong... this user doesn't exist? Invalidate
+ # this session.
request.session.invalidate()
request.user = user