From 16cbed9c60cf948dfe8d5801d415d695167637ef Mon Sep 17 00:00:00 2001 From: Joe Cropper Date: Fri, 6 Jan 2017 15:57:57 -0600 Subject: [PATCH] Remove unncessary 'None' params in dict.get calls This patch is a general code clean-up and removes unnecessary parameters of 'None' when calling dict.get(key, None) as None is implicit. Change-Id: I783db5e055727fa949b51a8a3717dcf74faf6f01 Closes-Bug: #1654664 --- zun/api/controllers/v1/containers.py | 19 +++++++++---------- zun/api/controllers/v1/images.py | 8 ++++---- zun/tests/unit/api/utils.py | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/zun/api/controllers/v1/containers.py b/zun/api/controllers/v1/containers.py index 99b3b0e09..b496fe698 100644 --- a/zun/api/controllers/v1/containers.py +++ b/zun/api/controllers/v1/containers.py @@ -37,11 +37,10 @@ LOG = logging.getLogger(__name__) def _get_container(container_id): - container = api_utils.get_resource('Container', - container_id) + container = api_utils.get_resource('Container', container_id) if not container: - pecan.abort(404, _LE('Not Found. Container you requested ' - 'for does not exist.')) + pecan.abort(404, _LE('Not found; the container you requested ' + 'does not exist.')) return container @@ -195,15 +194,15 @@ class ContainersController(rest.RestController): def _get_containers_collection(self, **kwargs): context = pecan.request.context - limit = api_utils.validate_limit(kwargs.get('limit', None)) + limit = api_utils.validate_limit(kwargs.get('limit')) sort_dir = api_utils.validate_sort_dir(kwargs.get('sort_dir', 'asc')) sort_key = kwargs.get('sort_key', 'id') - resource_url = kwargs.get('resource_url', None) - expand = kwargs.get('expand', None) + resource_url = kwargs.get('resource_url') + expand = kwargs.get('expand') filters = None marker_obj = None - marker = kwargs.get('marker', None) + marker = kwargs.get('marker') if marker: marker_obj = objects.Container.get_by_uuid(context, marker) @@ -419,8 +418,8 @@ class ContainersController(rest.RestController): container = _get_container(container_id) check_policy_on_container(container.as_dict(), "container:kill") LOG.debug('Calling compute.container_kill with %s signal %s' - % (container.uuid, kw.get('signal', kw.get('signal', None)))) + % (container.uuid, kw.get('signal', kw.get('signal')))) context = pecan.request.context container = pecan.request.rpcapi.container_kill(context, container, - kw.get('signal', None)) + kw.get('signal')) return Container.convert_with_links(container.as_dict()) diff --git a/zun/api/controllers/v1/images.py b/zun/api/controllers/v1/images.py index 9f7bbdad7..ca26b807a 100644 --- a/zun/api/controllers/v1/images.py +++ b/zun/api/controllers/v1/images.py @@ -153,14 +153,14 @@ class ImagesController(rest.RestController): def _get_images_collection(self, **kwargs): context = pecan.request.context - limit = api_utils.validate_limit(kwargs.get('limit', None)) + limit = api_utils.validate_limit(kwargs.get('limit')) sort_dir = api_utils.validate_sort_dir(kwargs.get('sort_dir', 'asc')) sort_key = kwargs.get('sort_key', 'id') - resource_url = kwargs.get('resource_url', None) - expand = kwargs.get('expand', None) + resource_url = kwargs.get('resource_url') + expand = kwargs.get('expand') filters = None marker_obj = None - marker = kwargs.get('marker', None) + marker = kwargs.get('marker') if marker: marker_obj = objects.Image.get_by_uuid(context, marker) images = objects.Image.list(context, diff --git a/zun/tests/unit/api/utils.py b/zun/tests/unit/api/utils.py index f1560da16..4afee7104 100644 --- a/zun/tests/unit/api/utils.py +++ b/zun/tests/unit/api/utils.py @@ -26,7 +26,7 @@ def zservice_get_data(**kw): 'id': kw.get('id', 13), 'report_count': kw.get('report_count', 13), 'disabled': kw.get('disabled', False), - 'disabled_reason': kw.get('disabled_reason', None), + 'disabled_reason': kw.get('disabled_reason'), 'forced_down': kw.get('forced_down', False), 'last_seen_at': kw.get('last_seen_at', faketime), 'created_at': kw.get('created_at', faketime),