Remove unused None from dict.get()

Since the default value is None when can't get a key from a dict,
So there is no need to use dict.get('key', None).

Change-Id: Ie8008e83f432263e7a97e482e83f240b1056feee

glance/api/v2/images.py

@@ -658,7 +658,7 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
             if visibility not in ['community', 'public', 'private', 'shared']:
                 msg = _('Invalid visibility value: %s') % visibility
                 raise webob.exc.HTTPBadRequest(explanation=msg)
-        changes_since = filters.get('changes-since', None)
+        changes_since = filters.get('changes-since')
         if changes_since:
             msg = _('The "changes-since" filter is no longer available on v2.')
             raise webob.exc.HTTPBadRequest(explanation=msg)

glance/cmd/cache_manage.py

@@ -292,7 +292,7 @@ def env(*vars, **kwargs):
     returns the default defined in kwargs.
     """
     for v in vars:
-        value = os.environ.get(v, None)
+        value = os.environ.get(v)
         if value:
             return value
     return kwargs.get('default', '')

glance/cmd/replicator.py

@@ -652,7 +652,7 @@ def replication_compare(options, args):
                     del headers[key]
 
             for key in image:
-                if image[key] != headers.get(key, None):
+                if image[key] != headers.get(key):
                     LOG.warn(_LW('%(image_id)s: field %(key)s differs '
                                  '(source is %(source_value)s, destination '
                                  'is %(target_value)s)')

glance/db/simple/api.py

@@ -1220,7 +1220,7 @@ def metadef_namespace_get_all(context,
                               filters=None):
     """Get a namespaces list"""
     resource_types = filters.get('resource_types', []) if filters else []
-    visibility = filters.get('visibility', None) if filters else None
+    visibility = filters.get('visibility') if filters else None
 
     namespaces = []
     for namespace in DATA['metadef_namespaces']:

glance/db/sqlalchemy/api.py

@@ -783,7 +783,7 @@ def _image_update(context, values, image_id, purge_props=False,
 
         location_data = values.pop('locations', None)
 
-        new_status = values.get('status', None)
+        new_status = values.get('status')
         if image_id:
             image_ref = _image_get(context, image_id, session=session)
             current = image_ref.status

glance/db/sqlalchemy/metadata.py

@@ -234,11 +234,11 @@ def _populate_metadata(meta, metadata_path=None, merge=False,
             continue
 
         values = {
-            'namespace': metadata.get('namespace', None),
-            'display_name': metadata.get('display_name', None),
-            'description': metadata.get('description', None),
-            'visibility': metadata.get('visibility', None),
-            'protected': metadata.get('protected', None),
+            'namespace': metadata.get('namespace'),
+            'display_name': metadata.get('display_name'),
+            'description': metadata.get('description'),
+            'visibility': metadata.get('visibility'),
+            'protected': metadata.get('protected'),
             'owner': metadata.get('owner', 'admin')
         }
 
@@ -296,8 +296,8 @@ def _populate_metadata(meta, metadata_path=None, merge=False,
                 'namespace_id': namespace_id,
                 'resource_type_id': rt_id,
                 'properties_target': resource_type.get(
-                    'properties_target', None),
-                'prefix': resource_type.get('prefix', None)
+                    'properties_target'),
+                'prefix': resource_type.get('prefix')
             }
             namespace_resource_type = _get_namespace_resource_type_by_ids(
                 meta, namespace_id, rt_id)
@@ -329,10 +329,10 @@ def _populate_metadata(meta, metadata_path=None, merge=False,
         for object in metadata.get('objects', []):
             values = {
                 'name': object['name'],
-                'description': object.get('description', None),
+                'description': object.get('description'),
                 'namespace_id': namespace_id,
                 'json_schema': json.dumps(
-                    object.get('properties', None))
+                    object.get('properties'))
             }
             object_id = _get_resource_id(objects_table, namespace_id,
                                          object['name'])

glance/registry/api/v1/images.py

@@ -295,7 +295,7 @@ class Controller(object):
 
     def _get_marker(self, req):
         """Parse a marker query param into something usable."""
-        marker = req.params.get('marker', None)
+        marker = req.params.get('marker')
 
         if marker and not uuidutils.is_uuid_like(marker):
             msg = _('Invalid marker format')
@@ -332,7 +332,7 @@ class Controller(object):
 
     def _get_is_public(self, req):
         """Parse is_public into something usable."""
-        is_public = req.params.get('is_public', None)
+        is_public = req.params.get('is_public')
 
         if is_public is None:
             # NOTE(vish): This preserves the default value of showing only
@@ -468,7 +468,7 @@ class Controller(object):
         :returns: Returns the updated image information as a mapping,
         """
         image_data = body['image']
-        from_state = body.get('from_state', None)
+        from_state = body.get('from_state')
 
         # Prohibit modification of 'owner'
         if not req.context.is_admin and 'owner' in image_data:

glance/tests/stubs.py

@@ -171,7 +171,7 @@ def stub_out_registry_and_store_server(stubs, base_dir, **kwargs):
             return FakeGlanceConnection
         elif (client.port == DEFAULT_REGISTRY_PORT and
               client.host == '0.0.0.0'):
-            rserver = kwargs.get("registry", None)
+            rserver = kwargs.get("registry")
             return FakeRegistryConnection(registry=rserver)
 
     def fake_image_iter(self):

glance/tests/unit/v1/test_api.py

@@ -2030,7 +2030,7 @@ class TestGlanceAPI(base.IsolatedUnitTest):
 
         def mock_update_image_metadata(*args, **kwargs):
 
-            if args[2].get('size', None) == len(data):
+            if args[2].get('size') == len(data):
                 path = "/images/%s" % image_id
                 req = unit_test_utils.get_fake_request(path=path,
                                                        method='DELETE',

glance/tests/unit/v2/test_tasks_resource.py

@@ -73,13 +73,13 @@ def _domain_fixture(task_id, **kwargs):
         'task_id': task_id,
         'status': kwargs.get('status', 'pending'),
         'task_type': kwargs.get('type', 'import'),
-        'owner': kwargs.get('owner', None),
-        'expires_at': kwargs.get('expires_at', None),
+        'owner': kwargs.get('owner'),
+        'expires_at': kwargs.get('expires_at'),
         'created_at': kwargs.get('created_at', default_datetime),
         'updated_at': kwargs.get('updated_at', default_datetime),
         'task_input': kwargs.get('task_input', {}),
-        'message': kwargs.get('message', None),
-        'result': kwargs.get('result', None)
+        'message': kwargs.get('message'),
+        'result': kwargs.get('result')
     }
     task = glance.domain.Task(**task_properties)
     return task