no more deprecated .has_key(...)

2015-12-22 15:39:32 -05:00
parent bb2aa29867
commit 0259ea3d29
8 changed files with 9 additions and 9 deletions
@@ -4219,7 +4219,7 @@ class Auth(object):
        if resolve:
            if slug:
                wiki = self._wiki.read(slug, force_render)
-                if isinstance(wiki, dict) and wiki.has_key('content'):  # FIXME: .has_key() is deprecated
+                if isinstance(wiki, dict) and 'content' in wiki:
                    # We don't want to return a dict object, just the wiki
                    wiki = wiki['content']
            else:
@@ -5239,7 +5239,7 @@ class Service(object):

        def return_error(id, code, message=None, data=None):
            error = {'code': code}
-            if Service.jsonrpc_errors.has_key(code):
+            if code in Service.jsonrpc_errors:
                error['message'] = Service.jsonrpc_errors[code][0]
                error['data'] = Service.jsonrpc_errors[code][1]
            if message is not None: