Resolve E722 do not use bare except

Bare exceptions violates one of Pythons idioms that bare exceptions
should not be used. The reason for this is that a bare except catches
all exceptions and can make programming errors look like runtime
problems making debugging more difficult.

Change-Id: I7006639302ef2efc9301c384c19218dd6783c825
Ref: https://docs.python.org/3.1/howto/doanddont.html#except
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/csit/libraries/AAAJsonUtils.py b/csit/libraries/AAAJsonUtils.py
index 80391e35e9a05be6b826cc2398a07f9b695e33be..d0000705fe8bcd3d28e86c912f35b5b1eea79b57 100644 (file)
--- a/csit/libraries/AAAJsonUtils.py
+++ b/csit/libraries/AAAJsonUtils.py
@@ -205,7 +205,7 @@ def get_id_by_name(args):
             try:
                 if name == name_record:
                     return node_record
-            except:
+            except Exception:
                 raise
 
 
@@ -282,7 +282,7 @@ def get_attribute_by_id(args):
             try:
                 name_record = jsonobj[blobkey][i]['name']
                 node_record = jsonobj[blobkey][i][typename]
-            except:
+            except Exception:
                 name_record = jsonobj['name']
                 node_record = jsonobj[typename]
 
@@ -319,7 +319,7 @@ def get_role_id_by_rolename(pobject, rolename, number_nodes):
                              'typeval': 'role'})
     try:
         roleid
-    except:
+    except Exception:
         raise
     else:
         return roleid
@@ -355,7 +355,7 @@ def get_role_name_by_roleid(pobject, roleid, number_nodes):
                                     'typeval': 'role'})
     try:
         rolename
-    except:
+    except Exception:
         raise
     else:
         return rolename
@@ -391,7 +391,7 @@ def get_role_description_by_roleid(pobject, roleid, number_nodes):
                                     'typeval': 'role'})
     try:
         roledesc
-    except:
+    except Exception:
         raise
     else:
         return roledesc
@@ -428,7 +428,7 @@ def get_domain_id_by_domainname(pobject, domainname, number_nodes):
 
     try:
         domainid
-    except:
+    except Exception:
         raise
     else:
         return domainid
@@ -465,7 +465,7 @@ def get_domain_name_by_domainid(pobject, domainid, number_nodes):
                                       'typeval': 'domain'})
     try:
         domainname
-    except:
+    except Exception:
         raise
     else:
         return domainname
@@ -502,7 +502,7 @@ def get_domain_description_by_domainid(pobject, domainid, number_nodes):
                                       'typeval': 'domain'})
     try:
         domaindesc
-    except:
+    except Exception:
         raise
     else:
         return domaindesc
@@ -539,7 +539,7 @@ def get_domain_state_by_domainid(pobject, domainid, number_nodes):
                                        'typeval': 'domain'})
     try:
         domainstate
-    except:
+    except Exception:
         raise
     else:
         return domainstate
@@ -578,7 +578,7 @@ def get_user_id_by_username(pobject, username, number_nodes):
                              'typeval': 'user'})
     try:
         userid
-    except:
+    except Exception:
         raise
     else:
         return userid
@@ -618,7 +618,7 @@ def get_user_password_by_userid(pobject, userid, number_nodes):
                                         'typeval': 'user'})
     try:
         userpassword
-    except:
+    except Exception:
         raise
     else:
         return userpassword
@@ -658,7 +658,7 @@ def get_user_name_by_userid(pobject, userid, number_nodes):
                                     'typeval': 'user'})
     try:
         username
-    except:
+    except Exception:
         raise
     else:
         return username
@@ -698,7 +698,7 @@ def get_user_state_by_userid(pobject, userid, number_nodes):
                                      'typeval': 'user'})
     try:
         userstate
-    except:
+    except Exception:
         raise
     else:
         return userstate
@@ -738,7 +738,7 @@ def get_user_email_by_userid(pobject, userid, number_nodes):
                                      'typeval': 'user'})
     try:
         useremail
-    except:
+    except Exception:
         raise
     else:
         return useremail
@@ -778,7 +778,7 @@ def get_user_description_by_userid(pobject, userid, number_nodes):
                                     'typeval': 'user'})
     try:
         userdesc
-    except:
+    except Exception:
         raise
     else:
         return userdesc

diff --git a/csit/libraries/ClusterStateLibrary.py b/csit/libraries/ClusterStateLibrary.py
index 815e6e3dcf0fc4da557e491deb16b9c9ddbe0ee6..91d82e1dfde7bf06d09b12b8384fa85d9488ade9 100644 (file)
--- a/csit/libraries/ClusterStateLibrary.py
+++ b/csit/libraries/ClusterStateLibrary.py
@@ -45,7 +45,7 @@ def getClusterRoles(shardName, numOfShards=3, numOfTries=3, sleepBetweenRetriesI
                         dataValue = data['value']
                         print("datavalue RaftState is", dataValue['RaftState'])
                         dict[ip] = dataValue['RaftState']
-                except:
+                except Exception:
                     e = sys.exc_info()[0]
                     print("Try" + str(j) + ":An error occurred when finding leader on" + ip +
                           " for shardName:" + shardMemberName)

diff --git a/tools/distchanges/gerritquery.py b/tools/distchanges/gerritquery.py
index b6cddc5cdb22fd526cab938ec18994779f6609b8..9f5b7f455ad30fd48d69c1eaf1d470bbcd84faa8 100644 (file)
--- a/tools/distchanges/gerritquery.py
+++ b/tools/distchanges/gerritquery.py
@@ -82,7 +82,7 @@ class GerritQuery:
                 return string.encode(encoding or 'utf-8', 'replace')
             else:
                 return str(string)
-        except:
+        except Exception:
             return str(string)
 
     def run_command_status(self, *argv, **kwargs):

diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py
index 65cb5d2da81b1633edff4189600b5b5b9a5ee67f..d4e71ada2a6a32e9073999c31d46226f7ab51305 100755 (executable)
--- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py
+++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py
@@ -133,7 +133,7 @@ class InventoryCrawler(object):
                 for n in range(len(sinv)):
                     try:
                         self.crawl_node(sinv[n])
-                    except:
+                    except Exception:
                         print('Can not crawl %s' % sinv[n]['id'])
 
             except KeyError:

diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py
index 1b2a28025cbffddd15d4c5e2f1fdc2d2079693b4..ed62d52da2a010f816493ef6f57ce1f9d4bde463 100755 (executable)
--- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py
+++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py
@@ -222,7 +222,7 @@ class TestUrlGenerator(object):
         else:
             try:
                 r_url = self.url_generator(json.loads(r.content))
-            except:
+            except Exception:
                 print("Failed to get json from '%s'. Please make sure you are connected to mininet." % (r_url))
 
         return r_url