3 files changed, 3 insertions, 4 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()
-
diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index d9c6e654..6e01a7dd 100644
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -40,7 +40,7 @@ def get_jinja_env(template_loader, locale):
 
     # If we have a jinja environment set up with this locale, just
     # return that one.
-    if SETUP_JINJA_ENVS.has_key(locale):
+    if locale in SETUP_JINJA_ENVS:
         return SETUP_JINJA_ENVS[locale]
 
     # jinja2.StrictUndefined will give exceptions on references
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py
index 96144538..1d37c4de 100644
--- a/mediagoblin/tools/translate.py
+++ b/mediagoblin/tools/translate.py
@@ -73,7 +73,7 @@ def get_locale_from_request(request):
     """
     request_args = (request.args, request.form)[request.method=='POST']
 
-    if request_args.has_key('lang'):
+    if 'lang' in request_args:
         # User explicitely demanded a language, normalize lower_uppercase
         target_lang = locale_to_lower_upper(request_args['lang'])