mirror of
https://github.com/ansible/awx.git
synced 2026-05-09 18:37:36 -02:30
flake8: comply with new E722 rule
This commit is contained in:
committed by
Ryan Petrello
parent
7538b4ce15
commit
67867cf0c8
@@ -84,7 +84,7 @@ class URLField(CharField):
|
||||
else:
|
||||
netloc = '{}@{}' % (url_parts.username, netloc)
|
||||
value = urlparse.urlunsplit([url_parts.scheme, netloc, url_parts.path, url_parts.query, url_parts.fragment])
|
||||
except:
|
||||
except Exception:
|
||||
raise # If something fails here, just fall through and let the validators check it.
|
||||
super(URLField, self).run_validators(value)
|
||||
|
||||
|
||||
@@ -162,14 +162,14 @@ class SettingsRegistry(object):
|
||||
if category_slug == 'user' and for_user:
|
||||
try:
|
||||
field_instance.default = original_field_instance.to_representation(getattr(self.settings, setting))
|
||||
except:
|
||||
except Exception:
|
||||
logger.warning('Unable to retrieve default value for user setting "%s".', setting, exc_info=True)
|
||||
elif not field_instance.read_only or field_instance.default is empty or field_instance.defined_in_file:
|
||||
try:
|
||||
field_instance.default = original_field_instance.to_representation(self.settings._awx_conf_settings._get_default(setting))
|
||||
except AttributeError:
|
||||
pass
|
||||
except:
|
||||
except Exception:
|
||||
logger.warning('Unable to retrieve default value for setting "%s".', setting, exc_info=True)
|
||||
|
||||
# `PENDO_TRACKING_STATE` is disabled for the open source awx license
|
||||
|
||||
@@ -366,7 +366,7 @@ class SettingsWrapper(UserSettingsHolder):
|
||||
return internal_value
|
||||
else:
|
||||
return field.run_validation(value)
|
||||
except:
|
||||
except Exception:
|
||||
logger.warning(
|
||||
'The current value "%r" for setting "%s" is invalid.',
|
||||
value, name, exc_info=True)
|
||||
|
||||
Reference in New Issue
Block a user