summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-13 16:50:39 +0000
committerGerrit Code Review <review@openstack.org>2018-09-13 16:50:39 +0000
commit0fdbc4780ddbe9aa22a947f9fdf25c13c45df107 (patch)
tree81c16b3e26f799aa8c3112ca68eea0c4b7942492
parent5c7b5a2d1d357b0d74633de9faf1185838f244a5 (diff)
parent39defc040be768d0811e3a7babb927fe648a553c (diff)
Merge "Clean up bare raised pylint warning"
-rw-r--r--.pylintrc1
-rw-r--r--cinder/volume/drivers/huawei/rest_client.py2
-rw-r--r--cinder/volume/drivers/netapp/dataontap/client/api.py2
3 files changed, 2 insertions, 3 deletions
diff --git a/.pylintrc b/.pylintrc
index dc88707..ac58990 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -80,7 +80,6 @@ disable=
80 keyword-arg-before-vararg, 80 keyword-arg-before-vararg,
81 too-many-function-args, 81 too-many-function-args,
82 unsupported-assignment-operation, 82 unsupported-assignment-operation,
83 misplaced-bare-raise,
84 not-an-iterable, 83 not-an-iterable,
85 unsupported-membership-test, 84 unsupported-membership-test,
86 unsupported-assignment-operation, 85 unsupported-assignment-operation,
diff --git a/cinder/volume/drivers/huawei/rest_client.py b/cinder/volume/drivers/huawei/rest_client.py
index f645de2..e5291d4 100644
--- a/cinder/volume/drivers/huawei/rest_client.py
+++ b/cinder/volume/drivers/huawei/rest_client.py
@@ -2374,7 +2374,7 @@ class RestClient(object):
2374 result = self.call(url, None, "GET", log_filter_flag=True) 2374 result = self.call(url, None, "GET", log_filter_flag=True)
2375 2375
2376 if result['error']['code'] != 0: 2376 if result['error']['code'] != 0:
2377 raise 2377 raise Exception(_('Failed to get object count.'))
2378 2378
2379 if result.get("data"): 2379 if result.get("data"):
2380 return result.get("data").get("COUNT") 2380 return result.get("data").get("COUNT")
diff --git a/cinder/volume/drivers/netapp/dataontap/client/api.py b/cinder/volume/drivers/netapp/dataontap/client/api.py
index 31d8d27..7f1c96c 100644
--- a/cinder/volume/drivers/netapp/dataontap/client/api.py
+++ b/cinder/volume/drivers/netapp/dataontap/client/api.py
@@ -348,7 +348,7 @@ class NaElement(object):
348 if isinstance(na_element, NaElement): 348 if isinstance(na_element, NaElement):
349 self._element.append(na_element._element) 349 self._element.append(na_element._element)
350 return 350 return
351 raise 351 raise Exception(_('Failed to add child element.'))
352 352
353 def get_child_by_name(self, name): 353 def get_child_by_name(self, name):
354 """Get the child element by the tag name.""" 354 """Get the child element by the tag name."""