Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=e44edad25... Commit: e44edad253cbd09636a81ac2d4d664218c511dd8 Parent: d2cdfc62d32402f264a8828cd519f0182e2a5645 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Wed Apr 23 17:46:42 2014 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Wed Apr 23 17:46:42 2014 +0200
[cleanup] Add broad exception specification for each except
--- fence/agents/alom/fence_alom.py | 2 +- fence/agents/apc/fence_apc.py | 2 +- fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/brocade/fence_brocade.py | 2 +- fence/agents/cisco_ucs/fence_cisco_ucs.py | 2 +- fence/agents/drac/fence_drac.py | 2 +- fence/agents/drac5/fence_drac5.py | 2 +- fence/agents/dummy/fence_dummy.py | 2 +- fence/agents/eaton_snmp/fence_eaton_snmp.py | 2 +- fence/agents/hds_cb/fence_hds_cb.py | 2 +- fence/agents/hpblade/fence_hpblade.py | 2 +- fence/agents/ilo_mp/fence_ilo_mp.py | 2 +- fence/agents/lib/fencing.py.py | 2 +- fence/agents/lpar/fence_lpar.py | 2 +- fence/agents/netio/fence_netio.py | 2 +- fence/agents/raritan/fence_raritan.py | 2 +- fence/agents/rsa/fence_rsa.py | 2 +- fence/agents/rsb/fence_rsb.py | 2 +- fence/agents/sanbox2/fence_sanbox2.py | 8 ++++---- fence/agents/virsh/fence_virsh.py | 2 +- fence/agents/wti/fence_wti.py | 2 +- 21 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index c2af527..d64838e 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -57,7 +57,7 @@ agent which can be used with ALOM connected machines." try: conn.send_eol("logout") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 4b4c2bc..c6a9aaf 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -262,7 +262,7 @@ will block any necessary fencing actions." try: conn.send_eol("4") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 0f59f55..b6cd005 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -111,7 +111,7 @@ and uses the command line interface to power on and off blades." try: conn.send_eol("exit") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/brocade/fence_brocade.py b/fence/agents/brocade/fence_brocade.py index 3bbb74c..716bad1 100644 --- a/fence/agents/brocade/fence_brocade.py +++ b/fence/agents/brocade/fence_brocade.py @@ -79,7 +79,7 @@ FC switch needs to be enabled. This can be done by running fence_brocade and spe try: conn.send_eol("exit") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 57c8d4e..fd4fa6c 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -136,7 +136,7 @@ used with Cisco UCS to fence machines." if result == None: ## Cookie is absenting in response fail(EC_LOGIN_DENIED) - except: + except Exception: fail(EC_LOGIN_DENIED)
options["cookie"] = result.group(1) diff --git a/fence/agents/drac/fence_drac.py b/fence/agents/drac/fence_drac.py index 3cd7653..4c0dea8 100644 --- a/fence/agents/drac/fence_drac.py +++ b/fence/agents/drac/fence_drac.py @@ -72,7 +72,7 @@ To enable telnet on the DRAC: \ try: conn.send_eol("exit") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 6f70dad..ade299e 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -154,7 +154,7 @@ By default, the telnet interface is not enabled." conn.send_eol("exit") time.sleep(1) conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/dummy/fence_dummy.py b/fence/agents/dummy/fence_dummy.py index f460746..5256aa8 100644 --- a/fence/agents/dummy/fence_dummy.py +++ b/fence/agents/dummy/fence_dummy.py @@ -21,7 +21,7 @@ def get_power_status_file(conn, options):
try: status_file = open(options["--status-file"], 'r') - except: + except Exception: return "off"
status = status_file.read() diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index 884fd6d..59a6147 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -141,7 +141,7 @@ def get_power_status(conn, options): return "off" else: return None - except: + except Exception: return None
def set_power_status(conn, options): diff --git a/fence/agents/hds_cb/fence_hds_cb.py b/fence/agents/hds_cb/fence_hds_cb.py index 6caee7f..8092de1 100755 --- a/fence/agents/hds_cb/fence_hds_cb.py +++ b/fence/agents/hds_cb/fence_hds_cb.py @@ -137,7 +137,7 @@ includes telnet support." try: conn.sendline("X") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py index 636c77d..ee59d5f 100644 --- a/fence/agents/hpblade/fence_hpblade.py +++ b/fence/agents/hpblade/fence_hpblade.py @@ -88,7 +88,7 @@ and uses the command line interface to power on and off blades." try: conn.send_eol("exit") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index 1d874c1..6cc2d9f 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -60,7 +60,7 @@ def main():
try: conn.send_eol("exit") - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 845372b..964e613 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -1102,7 +1102,7 @@ def run_command(options, command, timeout = None, env = None):
try: process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env) - except OSError, ex: + except OSError: fail_usage("Unable to run %s\n" % command)
thread = threading.Thread(target = process.wait) diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 304ebe4..c487656 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -156,7 +156,7 @@ def main(): try: conn.send("quit\r\n") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/netio/fence_netio.py b/fence/agents/netio/fence_netio.py index 3b8247b..4cf3b43 100755 --- a/fence/agents/netio/fence_netio.py +++ b/fence/agents/netio/fence_netio.py @@ -107,7 +107,7 @@ block any necessary fencing actions." conn.send("quit\n") conn.log_expect(options, "110 BYE", int(options["--shell-timeout"])) conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/raritan/fence_raritan.py b/fence/agents/raritan/fence_raritan.py index 7704c41..efd5605 100644 --- a/fence/agents/raritan/fence_raritan.py +++ b/fence/agents/raritan/fence_raritan.py @@ -90,7 +90,7 @@ block any necessary fencing actions." try: conn.send("exit\n") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index e163397..1167907 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -69,7 +69,7 @@ will block any necessary fencing actions." try: conn.send_eol("exit") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index e9e37de..7aab0ae 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -78,7 +78,7 @@ will block any necessary fencing actions." try: conn.send_eol("0") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index c53f1ef..996a501 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -34,7 +34,7 @@ def get_power_status(conn, options): conn.send_eol("admin end") conn.send_eol("exit") conn.close() - except: + except Exception: pass fail(EC_TIMED_OUT)
@@ -60,7 +60,7 @@ def set_power_status(conn, options): conn.send_eol("admin end") conn.send_eol("exit") conn.close() - except: + except Exception: pass fail(EC_TIMED_OUT)
@@ -72,7 +72,7 @@ def set_power_status(conn, options): conn.send_eol("admin end") conn.send_eol("exit") conn.close() - except: + except Exception: pass fail(EC_TIMED_OUT)
@@ -97,7 +97,7 @@ def get_list_devices(conn, options): conn.send_eol("admin end") conn.send_eol("exit") conn.close() - except: + except Exception: pass fail(EC_TIMED_OUT)
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 9f94f58..b56fec2 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -98,7 +98,7 @@ must allow ssh login in your sshd_config." try: conn.sendline("quit") conn.close() - except: + except Exception: pass
sys.exit(result) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index a7e1c8f..290eaaa 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -243,7 +243,7 @@ is running because the connection will block any necessary fencing actions." try: conn.send("/X"+"\r\n") conn.close() - except: + except Exception: pass
sys.exit(result)