IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

pylint: remove bare except

Browse Source 
Bare except should not be used.

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Lukas Slebodnik <lslebodn@redhat.com>
This commit is contained in:
Martin Basti 2016-03-11 19:51:07 +01:00
parent aa74995736
commit 491447cc5a
25 changed files with 51 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/ipa-client-install
View File

@ -2470,11 +2470,11 @@ def install(options, env, fstore, statestore):
try:
socket.inet_pton(socket.AF_INET, srv)
is_ipaddr = True
except:
except socket.error:
try:
socket.inet_pton(socket.AF_INET6, srv)
is_ipaddr = True
except:
except socket.error:
is_ipaddr = False
if is_ipaddr:

2
install/tools/ipa-replica-manage
View File

@ -597,7 +597,7 @@ def clean_dangling_ruvs(realm, host, options):
conn = ipaldap.IPAdmin(master_cn, 636, cacert=CACERT)
conn.do_simple_bind(bindpw=options.dirman_passwd)
master_info['online'] = True
except:
except Exception:
print("The server '{host}' appears to be offline."
.format(host=master_cn))
offlines.add(master_cn)

10
install/tools/ipactl
View File

@ -343,13 +343,13 @@ def ipa_stop(options):
try:
print("Stopping %s Service" % svc)
svchandle.stop(capture_output=False)
except:
except Exception:
emit_err("Failed to stop %s Service" % svc)
try:
print("Stopping Directory Service")
dirsrv.stop(capture_output=False)
except:
except Exception:
raise IpactlError("Failed to stop Directory Service")
# remove file with list of started services
@ -383,7 +383,7 @@ def ipa_restart(options):
emit_err("Shutting down")
try:
dirsrv.stop(capture_output=False)
except:
except Exception:
pass
if isinstance(e, IpactlError):
# do not display any other error message
@ -421,7 +421,7 @@ def ipa_restart(options):
try:
print("Stopping %s Service" % svc)
svchandle.stop(capture_output=False)
except:
except Exception:
emit_err("Failed to stop %s Service" % svc)
try:
@ -521,7 +521,7 @@ def ipa_status(options):
print("%s Service: RUNNING" % svc)
else:
print("%s Service: STOPPED" % svc)
except:
except Exception:
emit_err("Failed to get %s Service status" % svc)
def main():

2
ipaclient/ipadiscovery.py
View File

@ -129,7 +129,7 @@ class IPADiscovery(object):
elif line.lower().startswith('search'):
domains += [(d, 'search domain from /etc/resolv.conf') for
d in line.split()[1:]]
except:
except Exception:
pass
if domain:
domains = [domain] + domains

4
ipalib/cli.py
View File

@ -663,7 +663,7 @@ class textui(backend.Backend):
selection = int(resp) - 1
if (selection >= 0 and selection < counter):
break
except:
except Exception:
# fall through to the error msg
pass
@ -907,7 +907,7 @@ class console(frontend.Command):
try:
with script:
exec(script, globals(), local)
except:
except Exception:
traceback.print_exc()
exit(1)
else:

4
ipalib/constants.py
View File

@ -28,10 +28,10 @@ from ipapython.version import VERSION, API_VERSION
try:
FQDN = socket.getfqdn()
except:
except Exception:
try:
FQDN = socket.gethostname()
except:
except Exception:
FQDN = None
# Path to CA certificate bundle

4
ipalib/plugins/dns.py
View File

@ -443,7 +443,7 @@ def _normalize_bind_aci(bind_acis):
netmask = ""
normalized.append(u"%s%s%s" % (prefix, str(ip), netmask))
continue
except:
except Exception:
normalized.append(bind_aci)
continue
@ -4030,7 +4030,7 @@ class dnsrecord_del(LDAPUpdate):
try:
param = self.params[attr]
attr_name = unicode(param.label or param.name)
except:
except Exception:
attr_name = attr
raise errors.AttrValueNotFound(attr=attr_name, value=val)
entry_attrs[attr] = list(set(old_entry[attr]))

8
ipalib/plugins/hbactest.py
View File

@ -343,7 +343,7 @@ class hbactest(Command):
for rule in testrules:
try:
hbacset.append(self.api.Command.hbacrule_show(rule)['result'])
except:
except Exception:
pass
# We have some rules, import them
@ -426,7 +426,7 @@ class hbactest(Command):
if 'memberofindirect_group' in search_result:
groups += search_result['memberofindirect_group']
request.user.groups = sorted(set(groups))
except:
except Exception:
pass
if options['service'] != u'all':
@ -435,7 +435,7 @@ class hbactest(Command):
service_result = self.api.Command.hbacsvc_show(request.service.name)['result']
if 'memberof_hbacsvcgroup' in service_result:
request.service.groups = service_result['memberof_hbacsvcgroup']
except:
except Exception:
pass
if options['targethost'] != u'all':
@ -446,7 +446,7 @@ class hbactest(Command):
if 'memberofindirect_hostgroup' in tgthost_result:
groups += tgthost_result['memberofindirect_hostgroup']
request.targethost.groups = sorted(set(groups))
except:
except Exception:
pass
matched_rules = []

6
ipalib/plugins/stageuser.py
View File

@ -565,7 +565,7 @@ class stageuser_activate(LDAPQuery):
try:
v.decode('utf-8')
self.log.debug("merge: %s:%r wiped" % (attr, v))
except:
except ValueError:
self.log.debug("merge %s: [no_print %s]" % (attr, v.__class__.__name__))
if isinstance(entry_to[attr], (list, tuple)):
# multi value attribute
@ -581,7 +581,7 @@ class stageuser_activate(LDAPQuery):
try:
v.decode('utf-8')
self.log.debug("Add: %s:%r" % (attr, v))
except:
except ValueError:
self.log.debug("Add %s: [no_print %s]" % (attr, v.__class__.__name__))
if isinstance(entry_to[attr], (list, tuple)):
@ -692,7 +692,7 @@ class stageuser_activate(LDAPQuery):
try:
self.log.error("Fail to delete the Staging user after activating it %s " % (staging_dn))
self._exc_wrapper(args, options, ldap.delete_entry)(active_dn)
except:
except Exception:
self.log.error("Fail to cleanup activation. The user remains active %s" % (active_dn))
raise

2
ipalib/plugins/user.py
View File

@ -731,7 +731,7 @@ class user_del(baseuser_del):
try:
self._preserve_user(pkey, delete_container, **options)
preserved.append(pkey_to_value(pkey, options))
except:
except Exception:
if not options.get('continue', False):
raise
failed.append(pkey_to_value(pkey, options))

4
ipaplatform/base/services.py
View File

@ -434,7 +434,7 @@ class SystemdService(PlatformService):
os.unlink(srv_lnk)
os.symlink(self.lib_path, srv_lnk)
ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"])
except:
except Exception:
pass
else:
self.__enable(instance_name)
@ -457,7 +457,7 @@ class SystemdService(PlatformService):
if os.path.islink(srv_lnk):
os.unlink(srv_lnk)
ipautil.run([paths.SYSTEMCTL, "--system", "daemon-reload"])
except:
except Exception:
pass
else:
try:

8
ipapython/config.py
View File

@ -160,19 +160,19 @@ def __parse_config(discover_server = True):
try:
if not config.default_realm:
config.default_realm = p.get("global", "realm")
except:
except AttributeError:
pass
if discover_server:
try:
s = p.get("global", "xmlrpc_uri")
server = urlsplit(s)
config.default_server.append(server.netloc)
except:
except Exception:
pass
try:
if not config.default_domain:
config.default_domain = p.get("global", "domain")
except:
except AttributeError:
pass
def __discover_config(discover_server = True):
@ -218,7 +218,7 @@ def __discover_config(discover_server = True):
hostname = str(server.target).rstrip(".")
config.default_server.append(hostname)
except:
except Exception:
pass
def add_standard_options(parser):

4
ipapython/ipautil.py
View File

@ -505,7 +505,7 @@ def file_exists(filename):
return True
else:
return False
except:
except Exception:
return False
def dir_exists(filename):
@ -515,7 +515,7 @@ def dir_exists(filename):
return True
else:
return False
except:
except Exception:
return False
def install_file(fname, dest):

2
ipapython/log_manager.py
View File

@ -606,7 +606,7 @@ def parse_log_level(level):
if isinstance(level, six.string_types):
try:
level = int(level)
except:
except ValueError:
pass
# If it's a string lookup it's name and map to logging level

17
ipapython/nsslib.py
View File

@ -223,17 +223,12 @@ class NSSConnection(httplib.HTTPConnection, NSSAddressFamilyFallback):
self.tls_version_max = str(tls_version_max)
def _create_socket(self):
# TODO: remove the try block once python-nss is guaranteed to contain
# these values
try:
#pylint: disable=E1101
ssl_enable_renegotiation = ssl.SSL_ENABLE_RENEGOTIATION
ssl_require_safe_negotiation = ssl.SSL_REQUIRE_SAFE_NEGOTIATION
ssl_renegotiate_requires_xtn = ssl.SSL_RENEGOTIATE_REQUIRES_XTN
except:
ssl_enable_renegotiation = 20
ssl_require_safe_negotiation = 21
ssl_renegotiate_requires_xtn = 2
ssl_enable_renegotiation = getattr(
ssl, 'SSL_ENABLE_RENEGOTIATION', 20)
ssl_require_safe_negotiation = getattr(
ssl,'SSL_REQUIRE_SAFE_NEGOTIATION', 21)
ssl_renegotiate_requires_xtn = getattr(
ssl, 'SSL_RENEGOTIATE_REQUIRES_XTN', 2)
# Create the socket here so we can do things like let the caller
# override the NSS callbacks

4
ipaserver/install/bindinstance.py
View File

@ -571,7 +571,7 @@ class DnsBackup(object):
try:
delkw = { '%srecord' % str(type.lower()) : unicode(rdata) }
api.Command.dnsrecord_del(unicode(zone), unicode(host), **delkw)
except:
except Exception:
pass
j += 1
@ -662,7 +662,7 @@ class BindInstance(service.Service):
try:
self.stop()
except:
except Exception:
pass
# get a connection to the DS

2
ipaserver/install/certs.py
View File

@ -127,7 +127,7 @@ class CertDB(object):
shutil.rmtree(self.reqdir, ignore_errors=True)
try:
os.chdir(self.cwd)
except:
except OSError:
pass
def setup_cert_request(self):

2
ipaserver/install/dnskeysyncinstance.py
View File

@ -122,7 +122,7 @@ class DNSKeySyncInstance(service.Service):
self.suffix = ipautil.realm_to_suffix(self.realm)
try:
self.stop()
except:
except Exception:
pass
# get a connection to the DS

4
ipaserver/install/installutils.py
View File

@ -120,10 +120,10 @@ def get_fqdn():
fqdn = ""
try:
fqdn = socket.getfqdn()
except:
except Exception:
try:
fqdn = socket.gethostname()
except:
except Exception:
fqdn = ""
return fqdn

6
ipaserver/install/krbinstance.py
View File

@ -135,7 +135,7 @@ class KrbInstance(service.Service):
self.backup_state("running", self.is_running())
try:
self.stop()
except:
except Exception:
# It could have been not running
pass
@ -210,7 +210,7 @@ class KrbInstance(service.Service):
def __start_instance(self):
try:
self.start()
except:
except Exception:
root_logger.critical("krb5kdc service failed to start")
def __setup_sub_dict(self):
@ -386,7 +386,7 @@ class KrbInstance(service.Service):
try:
self.stop()
except:
except Exception:
pass
for f in [paths.KRB5KDC_KDC_CONF, paths.KRB5_CONF]:

2
ipaserver/install/odsexporterinstance.py
View File

@ -50,7 +50,7 @@ class ODSExporterInstance(service.Service):
try:
self.stop()
except:
except Exception:
pass
# get a connection to the DS

2
ipaserver/install/server/install.py
View File

@ -286,7 +286,7 @@ def common_cleanup(func):
# what is the state of the environment
try:
installer._fstore.restore_file(paths.HOSTS)
except:
except Exception:
pass
return decorated

2
ipaserver/plugins/dogtag.py
View File

@ -1978,7 +1978,7 @@ class RestClient(Backend):
def _parse_dogtag_error(body):
try:
return pki.PKIException.from_json(json.loads(body))
except:
except Exception:
return None
def __init__(self, api):

2
ipatests/test_ipapython/test_ipautil.py
View File

@ -38,7 +38,7 @@ def make_ipaddress_checker(addr, words=None, prefixlen=None):
try:
ip = ipautil.CheckedIPAddress(addr, match_local=False)
assert ip.words == words and ip.prefixlen == prefixlen
except:
except Exception:
assert words is None and prefixlen is None
check_ipaddress.description = "Test IP address parsing and verification (%s)" % addr
return check_ipaddress

1
pylintrc
View File

@ -26,7 +26,6 @@ disable=
attribute-defined-outside-init,
bad-builtin,
bad-indentation,
bare-except,
broad-except,
dangerous-default-value,
eval-used,