User __dict__.get to avoid long lines.

This commit is contained in:
Alexis Lahouze 2017-05-19 16:48:47 +02:00
parent a8672a8656
commit 6c3f73cd75
3 changed files with 6 additions and 6 deletions

View File

@ -148,7 +148,7 @@ class AccountListResource(Resource):
data = self.api.payload data = self.api.payload
# A new account MUST NOT have an id; # A new account MUST NOT have an id;
if 'id' in data and data['id']: if data.get('id') is not None:
ns.abort(406, 'Id must not be provided on creation.') ns.abort(406, 'Id must not be provided on creation.')
# Instantiate account with data. # Instantiate account with data.
@ -203,7 +203,7 @@ class AccountResource(Resource):
data = self.api.payload data = self.api.payload
# Check ID consistency. # Check ID consistency.
if 'id' in data and data['id'] and data['id'] != account_id: if data.get('id', default=account_id) != account_id:
ns.abort(406, 'Id must not be provided or changed on update.') ns.abort(406, 'Id must not be provided or changed on update.')
# Need to get the object to update it. # Need to get the object to update it.

View File

@ -132,7 +132,7 @@ class OperationListResource(Resource):
ns.abort(404, 'Account with id %d not found.' % account_id) ns.abort(404, 'Account with id %d not found.' % account_id)
# A new operation MUST NOT have an id; # A new operation MUST NOT have an id;
if 'id' in data and data['id']: if data.get('id') is not None:
ns.abort(406, 'Id must not be provided on creation.') ns.abort(406, 'Id must not be provided on creation.')
operation = Operation(**data) operation = Operation(**data)
@ -181,7 +181,7 @@ class OperationResource(Resource):
data = self.api.payload data = self.api.payload
# Check ID consistency. # Check ID consistency.
if 'id' in data and data['id'] and data['id'] != operation_id: if data.get('id', default=operation_id) != operation_id:
ns.abort(406, 'Id must not be provided or changed on update.') ns.abort(406, 'Id must not be provided or changed on update.')
# pylint: disable=no-member # pylint: disable=no-member

View File

@ -106,7 +106,7 @@ class ScheduledOperationListResource(Resource):
ns.abort(404, 'Account with id %d not found.' % account_id) ns.abort(404, 'Account with id %d not found.' % account_id)
# A new scheduled operation MUST NOT have an id; # A new scheduled operation MUST NOT have an id;
if 'id' in data and data['id']: if data.get('id') is not None:
ns.abort(406, 'Id must not be provided on creation.') ns.abort(406, 'Id must not be provided on creation.')
scheduled_operation = ScheduledOperation(**data) scheduled_operation = ScheduledOperation(**data)
@ -160,7 +160,7 @@ class ScheduledOperationResource(Resource):
so_id = scheduled_operation_id so_id = scheduled_operation_id
# Check ID consistency. # Check ID consistency.
if 'id' in data and data['id'] and data['id'] != so_id: if data.get('id', default=so_id) != so_id:
ns.abort(406, 'Id must not be provided or changed on update.') ns.abort(406, 'Id must not be provided or changed on update.')
scheduled_operation = ScheduledOperation.query().get(so_id) scheduled_operation = ScheduledOperation.query().get(so_id)