diff options
author | Rex Lee <limingjiang@huawei.com> | 2017-02-16 06:30:28 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-02-16 06:30:28 +0000 |
commit | 1eb4b53c4a7e34c592337ba26583d13d40c9630a (patch) | |
tree | a1a97095e1799683cd2281c1b88a68ef530a9c23 /api | |
parent | 2c07b32c372594e5d0a936e76baca80ff87993c7 (diff) | |
parent | c6d584f5e050cf79eb640bae3d6ca36e2788890f (diff) |
Merge "pylint fixes: remove redundant parens, fix comparison order"
Diffstat (limited to 'api')
-rw-r--r-- | api/resources/env_action.py | 2 | ||||
-rw-r--r-- | api/utils/common.py | 2 | ||||
-rw-r--r-- | api/utils/influx.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/resources/env_action.py b/api/resources/env_action.py index 8955f3cb6..917681c37 100644 --- a/api/resources/env_action.py +++ b/api/resources/env_action.py @@ -248,7 +248,7 @@ def _get_remote_rc_file(rc_file, installer_ip, installer_type): cmd = [os_fetch_script, '-d', rc_file, '-i', installer_type, '-a', installer_ip] p = subprocess.Popen(cmd, stdout=subprocess.PIPE) - p.communicate()[0] + p.communicate() if p.returncode != 0: logger.debug('Failed to fetch credentials from installer') diff --git a/api/utils/common.py b/api/utils/common.py index 1c800ce49..3e9bf8f8b 100644 --- a/api/utils/common.py +++ b/api/utils/common.py @@ -33,7 +33,7 @@ def get_command_list(command_list, opts, args): command_list.append(args) - command_list.extend(('--{}'.format(k) for k in opts if 'task-args' != k)) + command_list.extend(('--{}'.format(k) for k in opts if k != 'task-args')) task_args = opts.get('task-args', '') if task_args: diff --git a/api/utils/influx.py b/api/utils/influx.py index 275c63a24..08996b9c9 100644 --- a/api/utils/influx.py +++ b/api/utils/influx.py @@ -24,7 +24,7 @@ def get_data_db_client(): try: parser.read(conf.OUTPUT_CONFIG_FILE_PATH) - if 'influxdb' != parser.get('DEFAULT', 'dispatcher'): + if parser.get('DEFAULT', 'dispatcher') != 'influxdb': raise RuntimeError return _get_client(parser) |