aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools/request.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2013-01-30 15:03:04 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2013-01-30 15:03:04 +0100
commit04453ccf422539a2f5752a83084cfac7a8c701ee (patch)
treeb7c555f914912a4689528ed708e687f95c0a096f /mediagoblin/tools/request.py
parent3f931680e361086508d24d357f3d4d44466164bf (diff)
downloadmediagoblin-04453ccf422539a2f5752a83084cfac7a8c701ee.tar.lz
mediagoblin-04453ccf422539a2f5752a83084cfac7a8c701ee.tar.xz
mediagoblin-04453ccf422539a2f5752a83084cfac7a8c701ee.zip
Better Py3 compat: d.has_key(k) -> k in d
py3 does not have dict.has_key any more. You have to use "key in dict" instead. As that works in python2 as well, let's use that. Also some small bits of pep8.
Diffstat (limited to 'mediagoblin/tools/request.py')
-rw-r--r--mediagoblin/tools/request.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/tools/request.py b/mediagoblin/tools/request.py
index f7311fac..bc67b96f 100644
--- a/mediagoblin/tools/request.py
+++ b/mediagoblin/tools/request.py
@@ -25,7 +25,7 @@ def setup_user_in_request(request):
Examine a request and tack on a request.user parameter if that's
appropriate.
"""
- if not request.session.has_key('user_id'):
+ if 'user_id' not in request.session:
request.user = None
return
@@ -36,4 +36,3 @@ def setup_user_in_request(request):
# this session.
_log.warn("Killing session for user id %r", request.session['user_id'])
request.session.invalidate()
-