Merge "Replaced calls of get(foo, None) -> get(foo)"

glance/api/middleware/cache.py

@@ -240,11 +240,11 @@ class CacheFilter(wsgi.Middleware):
         return resp
 
     def _process_GET_response(self, resp, image_id):
-        image_checksum = resp.headers.get('Content-MD5', None)
+        image_checksum = resp.headers.get('Content-MD5')
 
         if not image_checksum:
             # API V1 stores the checksum in a different header:
-            image_checksum = resp.headers.get('x-image-meta-checksum', None)
+            image_checksum = resp.headers.get('x-image-meta-checksum')
 
         if not image_checksum:
             LOG.error(_("Checksum header is missing."))

glance/api/v1/images.py

@@ -868,7 +868,7 @@ class Controller(controller.BaseController):
         activating = orig_status == 'queued' and (location or image_data)
 
         # Make image public in the backend store (if implemented)
-        orig_or_updated_loc = location or orig_image_meta.get('location', None)
+        orig_or_updated_loc = location or orig_image_meta.get('location')
         if orig_or_updated_loc:
             try:
                 self.update_store_acls(req, id, orig_or_updated_loc,

glance/api/v1/upload_utils.py

@@ -81,7 +81,7 @@ def upload_data_to_store(req, image_meta, image_data, store, notifier):
     image_id = image_meta['id']
 
     db_api = glance.db.get_api()
-    image_size = image_meta.get('size', None)
+    image_size = image_meta.get('size')
 
     try:
         remaining = glance.api.common.check_quota(

glance/api/v2/images.py

@@ -508,7 +508,7 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
         return member_status
 
     def _get_filters(self, filters):
-        visibility = filters.get('visibility', None)
+        visibility = filters.get('visibility')
         if visibility:
             if visibility not in ['public', 'private', 'shared']:
                 msg = _('Invalid visibility value: %s') % visibility

glance/api/v2/tasks.py

@@ -137,13 +137,13 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
         return sort_dir
 
     def _get_filters(self, filters):
-        status = filters.get('status', None)
+        status = filters.get('status')
         if status:
             if status not in ['pending', 'processing', 'success', 'failure']:
                 msg = _('Invalid status value: %s') % status
                 raise webob.exc.HTTPBadRequest(explanation=msg)
 
-        type = filters.get('type', None)
+        type = filters.get('type')
         if type:
             if type not in ['import']:
                 msg = _('Invalid type value: %s') % type

glance/db/simple/api.py

@@ -524,7 +524,7 @@ def image_create(context, image_values):
     image = _image_format(image_id, **image_values)
     DATA['images'][image_id] = image
 
-    location_data = image_values.get('locations', None)
+    location_data = image_values.get('locations')
     if location_data is not None:
         _image_locations_set(image_id, location_data)
 

glance/db/sqlalchemy/api.py

@@ -584,7 +584,7 @@ def _validate_image(values):
     :param values: Mapping of image metadata to check
     """
 
-    status = values.get('status', None)
+    status = values.get('status')
     if not status:
         msg = "Image status is required."
         raise exception.Invalid(msg)