From 557acb1815539c7f2354757de82ea20fc30847df Mon Sep 17 00:00:00 2001 From: Ankit Agrawal Date: Thu, 24 Sep 2015 06:31:32 -0700 Subject: [PATCH] Use dictionary literal for dictionary creation Dictionary creation could be rewritten as a dictionary literal. for example: expect_namespace = {} expect_namespace['namespace'] = 'MyNamespace' expect_namespace['protected'] = True could be rewritten as expect_namespace = { 'namespace': 'MyNamespace', 'protected': True } TrivialFix Change-Id: I76265c26861916ed01cadb62e9201aa871183566 --- glanceclient/tests/unit/v2/test_shell_v2.py | 105 +++++++++++--------- 1 file changed, 58 insertions(+), 47 deletions(-) diff --git a/glanceclient/tests/unit/v2/test_shell_v2.py b/glanceclient/tests/unit/v2/test_shell_v2.py index 39699ced..41490e16 100644 --- a/glanceclient/tests/unit/v2/test_shell_v2.py +++ b/glanceclient/tests/unit/v2/test_shell_v2.py @@ -705,9 +705,10 @@ class ShellV2Test(testtools.TestCase): 'protected': True}) with mock.patch.object(self.gc.metadefs_namespace, 'create') as mocked_create: - expect_namespace = {} - expect_namespace['namespace'] = 'MyNamespace' - expect_namespace['protected'] = True + expect_namespace = { + 'namespace': 'MyNamespace', + 'protected': True + } mocked_create.return_value = expect_namespace @@ -720,9 +721,10 @@ class ShellV2Test(testtools.TestCase): def test_do_md_namespace_import(self): args = self._make_args({'file': 'test'}) - expect_namespace = {} - expect_namespace['namespace'] = 'MyNamespace' - expect_namespace['protected'] = True + expect_namespace = { + 'namespace': 'MyNamespace', + 'protected': True + } with mock.patch.object(self.gc.metadefs_namespace, 'create') as mocked_create: @@ -757,9 +759,10 @@ class ShellV2Test(testtools.TestCase): 'protected': True}) with mock.patch.object(self.gc.metadefs_namespace, 'update') as mocked_update: - expect_namespace = {} - expect_namespace['namespace'] = 'MyNamespace' - expect_namespace['protected'] = True + expect_namespace = { + 'namespace': 'MyNamespace', + 'protected': True + } mocked_update.return_value = expect_namespace @@ -776,8 +779,7 @@ class ShellV2Test(testtools.TestCase): 'resource_type': None}) with mock.patch.object(self.gc.metadefs_namespace, 'get') as mocked_get: - expect_namespace = {} - expect_namespace['namespace'] = 'MyNamespace' + expect_namespace = {'namespace': 'MyNamespace'} mocked_get.return_value = expect_namespace @@ -792,8 +794,7 @@ class ShellV2Test(testtools.TestCase): 'resource_type': 'RESOURCE'}) with mock.patch.object(self.gc.metadefs_namespace, 'get') as mocked_get: - expect_namespace = {} - expect_namespace['namespace'] = 'MyNamespace' + expect_namespace = {'namespace': 'MyNamespace'} mocked_get.return_value = expect_namespace @@ -902,10 +903,11 @@ class ShellV2Test(testtools.TestCase): 'prefix': 'PREFIX:'}) with mock.patch.object(self.gc.metadefs_resource_type, 'associate') as mocked_associate: - expect_rt = {} - expect_rt['namespace'] = 'MyNamespace' - expect_rt['name'] = 'MyResourceType' - expect_rt['prefix'] = 'PREFIX:' + expect_rt = { + 'namespace': 'MyNamespace', + 'name': 'MyResourceType', + 'prefix': 'PREFIX:' + } mocked_associate.return_value = expect_rt @@ -960,10 +962,11 @@ class ShellV2Test(testtools.TestCase): 'schema': '{}'}) with mock.patch.object(self.gc.metadefs_property, 'create') as mocked_create: - expect_property = {} - expect_property['namespace'] = 'MyNamespace' - expect_property['name'] = 'MyProperty' - expect_property['title'] = 'Title' + expect_property = { + 'namespace': 'MyNamespace', + 'name': 'MyProperty', + 'title': 'Title' + } mocked_create.return_value = expect_property @@ -990,10 +993,11 @@ class ShellV2Test(testtools.TestCase): 'schema': '{}'}) with mock.patch.object(self.gc.metadefs_property, 'update') as mocked_update: - expect_property = {} - expect_property['namespace'] = 'MyNamespace' - expect_property['name'] = 'MyProperty' - expect_property['title'] = 'Title' + expect_property = { + 'namespace': 'MyNamespace', + 'name': 'MyProperty', + 'title': 'Title' + } mocked_update.return_value = expect_property @@ -1018,10 +1022,11 @@ class ShellV2Test(testtools.TestCase): 'property': 'MyProperty', 'max_column_width': 80}) with mock.patch.object(self.gc.metadefs_property, 'get') as mocked_get: - expect_property = {} - expect_property['namespace'] = 'MyNamespace' - expect_property['property'] = 'MyProperty' - expect_property['title'] = 'Title' + expect_property = { + 'namespace': 'MyNamespace', + 'property': 'MyProperty', + 'title': 'Title' + } mocked_get.return_value = expect_property @@ -1069,9 +1074,10 @@ class ShellV2Test(testtools.TestCase): 'schema': '{}'}) with mock.patch.object(self.gc.metadefs_object, 'create') as mocked_create: - expect_object = {} - expect_object['namespace'] = 'MyNamespace' - expect_object['name'] = 'MyObject' + expect_object = { + 'namespace': 'MyNamespace', + 'name': 'MyObject' + } mocked_create.return_value = expect_object @@ -1095,9 +1101,10 @@ class ShellV2Test(testtools.TestCase): 'schema': '{}'}) with mock.patch.object(self.gc.metadefs_object, 'update') as mocked_update: - expect_object = {} - expect_object['namespace'] = 'MyNamespace' - expect_object['name'] = 'MyObject' + expect_object = { + 'namespace': 'MyNamespace', + 'name': 'MyObject' + } mocked_update.return_value = expect_object @@ -1120,9 +1127,10 @@ class ShellV2Test(testtools.TestCase): 'object': 'MyObject', 'max_column_width': 80}) with mock.patch.object(self.gc.metadefs_object, 'get') as mocked_get: - expect_object = {} - expect_object['namespace'] = 'MyNamespace' - expect_object['object'] = 'MyObject' + expect_object = { + 'namespace': 'MyNamespace', + 'object': 'MyObject' + } mocked_get.return_value = expect_object @@ -1204,9 +1212,10 @@ class ShellV2Test(testtools.TestCase): 'name': 'MyTag'}) with mock.patch.object(self.gc.metadefs_tag, 'create') as mocked_create: - expect_tag = {} - expect_tag['namespace'] = 'MyNamespace' - expect_tag['name'] = 'MyTag' + expect_tag = { + 'namespace': 'MyNamespace', + 'name': 'MyTag' + } mocked_create.return_value = expect_tag @@ -1221,9 +1230,10 @@ class ShellV2Test(testtools.TestCase): 'name': 'NewTag'}) with mock.patch.object(self.gc.metadefs_tag, 'update') as mocked_update: - expect_tag = {} - expect_tag['namespace'] = 'MyNamespace' - expect_tag['name'] = 'NewTag' + expect_tag = { + 'namespace': 'MyNamespace', + 'name': 'NewTag' + } mocked_update.return_value = expect_tag @@ -1238,9 +1248,10 @@ class ShellV2Test(testtools.TestCase): 'tag': 'MyTag', 'sort_dir': 'desc'}) with mock.patch.object(self.gc.metadefs_tag, 'get') as mocked_get: - expect_tag = {} - expect_tag['namespace'] = 'MyNamespace' - expect_tag['tag'] = 'MyTag' + expect_tag = { + 'namespace': 'MyNamespace', + 'tag': 'MyTag' + } mocked_get.return_value = expect_tag