Fixed D701 Hacking check

Change-Id: Ife8d01540e6c4d15451fdda012d1bde7a885c845
This commit is contained in:
Graham Hayes 2014-07-14 14:42:23 +01:00
parent 5402d044b6
commit ed010fc4a0
7 changed files with 22 additions and 8 deletions

View File

@ -222,7 +222,9 @@ class FaultWrapperMiddleware(wsgi.Middleware):
# Handle all other exception types
return self._handle_exception(request, e)
def _handle_exception(self, request, e, status=500, response={}):
def _handle_exception(self, request, e, status=500, response=None):
response = response or {}
# Log the exception ASAP unless it is a 404 Not Found
if not getattr(e, 'expected', False):
LOG.exception(e)

View File

@ -121,7 +121,7 @@ class DynClient(object):
"""
def __init__(self, customer_name, user_name, password,
endpoint="https://api.dynect.net:443",
api_version='3.5.6', headers={}, verify=True, retries=1,
api_version='3.5.6', headers=None, verify=True, retries=1,
timeout=3, timings=False, pool_maxsize=10,
pool_connections=10):
self.customer_name = customer_name
@ -145,7 +145,9 @@ class DynClient(object):
'Accept': 'application/json',
'API-Version': api_version,
'User-Agent': 'DynECTClient'}
session.headers.update(headers)
if headers is not None:
session.headers.update(headers)
adapter = HTTPAdapter(max_retries=int(retries),
pool_maxsize=int(pool_maxsize),

View File

@ -335,9 +335,12 @@ class PowerDNSBackend(base.Backend):
record_m.save(self.session)
def _update_domainmetadata(self, domain_id, kind, values=[], delete=True):
def _update_domainmetadata(self, domain_id, kind, values=None,
delete=True):
"""Updates a domain's metadata with new values"""
# Fetch all current metadata of the specified kind
values = values or []
query = self.session.query(models.DomainMetadata)
query = query.filter_by(domain_id=domain_id, kind=kind)

View File

@ -27,11 +27,12 @@ class DesignateContext(context.RequestContext):
def __init__(self, auth_token=None, user=None, tenant=None, domain=None,
user_domain=None, project_domain=None, is_admin=False,
read_only=False, show_deleted=False, request_id=None,
instance_uuid=None, roles=[], service_catalog=None,
instance_uuid=None, roles=None, service_catalog=None,
all_tenants=False, **kwargs):
if kwargs:
LOG.warn(_LW('Arguments dropped when creating context: %s') %
str(kwargs))
roles = roles or []
super(DesignateContext, self).__init__(
auth_token=auth_token,
user=user,

View File

@ -17,7 +17,7 @@ import re
mutable_default_argument_check = re.compile(
r"def [a-zA-Z0-9].*\(.*(\{|\[|\().*\)\:")
r"^\s*def .+\((.+=\{\}|.+=\[\])")
def mutable_default_arguments(logical_line, filename):

View File

@ -159,12 +159,15 @@ class BaseAddressHandler(NotificationHandler):
Record(**record_values))
def _delete(self, managed=True, resource_id=None, resource_type='instance',
criterion={}):
criterion=None):
"""
Handle a generic delete of a fixed ip within a domain
:param criterion: Criterion to search and destroy records
"""
criterion = criterion or {}
context = DesignateContext.get_admin_context(all_tenants=True)
criterion.update({'domain_id': cfg.CONF[self.name].domain_id})

View File

@ -222,13 +222,16 @@ class DesignateObject(DictObjectMixin):
else:
raise KeyError(field)
def __deepcopy__(self, memodict={}):
def __deepcopy__(self, memodict=None):
"""
Efficiently make a deep copy of this object.
"Efficiently" is used here a relative term, this will be faster
than allowing python to naively deepcopy the object.
"""
memodict = memodict or {}
c_obj = self.__class__()
for field in self.FIELDS: