diff --git a/tools/migration/cfg/migrator_1_5_0/__init__.py b/tools/migration/cfg/migrator_1_5_0/__init__.py index a239df0a1..bead0a172 100644 --- a/tools/migration/cfg/migrator_1_5_0/__init__.py +++ b/tools/migration/cfg/migrator_1_5_0/__init__.py @@ -26,12 +26,12 @@ default = { def migrate(input_cfg, output_cfg): d = utils.read_conf(input_cfg) - keys = default.keys() + keys = list(default.keys()) keys.extend(['hostname', 'ui_url_protocol', 'max_job_workers', 'customize_crt', 'ssl_cert', 'ssl_cert_key', 'secretkey_path', 'admiral_url', 'db_password', 'clair_db_password']) val = {} for k in keys: - if d.has_key(k): + if k in d: val[k] = d[k] else: val[k] = default[k] diff --git a/tools/migration/cfg/utils.py b/tools/migration/cfg/utils.py index 5996012c5..34ed654d3 100644 --- a/tools/migration/cfg/utils.py +++ b/tools/migration/cfg/utils.py @@ -29,13 +29,13 @@ def read_conf(path): def get_conf_version(path): d = read_conf(path) # print json.dumps(d,indent=4) - if d.has_key("_version"): # >=1.5.0 + if "_version" in d: # >=1.5.0 return d["_version"] - if not d.has_key("clair_db_password"): + if not "clair_db_password" in d: return "unsupported" - if d.has_key("registry_storage_provider_name"): + if "registry_storage_provider_name" in d: return "1.4.0" - if d.has_key("uaa_endpoint"): + if "uaa_endpoint" in d: return "1.3.0" return "1.2.0"