diff options
author | Petr Viktorin <pviktori@redhat.com> | 2015-07-30 17:29:39 +0200 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2015-08-12 18:17:23 +0200 |
commit | 6a741b51dac6efd650f2427604bd54cbf300f761 (patch) | |
tree | 2a1ebde55d64a6e2f3c33d1cc8c1ce64f73570f7 /install | |
parent | 8b88caa110e83b42b1e43189c06b6cb3de712353 (diff) | |
download | freeipa-6a741b51dac6efd650f2427604bd54cbf300f761.tar.gz freeipa-6a741b51dac6efd650f2427604bd54cbf300f761.tar.xz freeipa-6a741b51dac6efd650f2427604bd54cbf300f761.zip |
Replace dict.has_key with the 'in' operator
The deprecated has_key method will be removed from dicts in Python 3.
For custom dict-like classes, has_key() is kept on Python 2,
but disabled for Python 3.
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'install')
-rw-r--r-- | install/migration/migration.py | 2 | ||||
-rwxr-xr-x | install/po/pygettext.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install/migration/migration.py b/install/migration/migration.py index e1823e151..05151e66b 100644 --- a/install/migration/migration.py +++ b/install/migration/migration.py @@ -69,7 +69,7 @@ def application(environ, start_response): return wsgi_redirect(start_response, 'index.html') form_data = cgi.FieldStorage(fp=environ['wsgi.input'], environ=environ) - if not form_data.has_key('username') or not form_data.has_key('password'): + if 'username' not in form_data or 'password' not in form_data: return wsgi_redirect(start_response, 'invalid.html') # API object only for configuration, finalize() not needed diff --git a/install/po/pygettext.py b/install/po/pygettext.py index 171bd4fc5..6f288ec11 100755 --- a/install/po/pygettext.py +++ b/install/po/pygettext.py @@ -280,7 +280,7 @@ def containsAny(str, set): def _visit_pyfiles(list, dirname, names): """Helper for getFilesForName().""" # get extension for python source files - if not globals().has_key('_py_ext'): + if '_py_ext' not in globals(): global _py_ext _py_ext = [triple[0] for triple in imp.get_suffixes() if triple[2] == imp.PY_SOURCE][0] |