From eb186fd1862818b4afb3a67e680f8ef5c725d405 Mon Sep 17 00:00:00 2001 From: zhang-jinnan Date: Fri, 14 Feb 2014 13:45:49 +0800 Subject: [PATCH] Remove None for dict.get() Because If no default value is specified it defaults to None already. Change-Id: I2b2ad6d80b4f36bf01b8f4c6ecfb6bbd6d62e75b --- ceilometer/agent.py | 2 +- ceilometer/nova_client.py | 2 +- ceilometer/service.py | 4 ++-- ceilometer/tests/storage/test_storage_scenarios.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ceilometer/agent.py b/ceilometer/agent.py index 4d4607ae8..308d178fd 100644 --- a/ceilometer/agent.py +++ b/ceilometer/agent.py @@ -78,7 +78,7 @@ class AgentManager(os_service.Service): self.pipeline_manager.pipelines, self.pollster_manager.extensions): if pipeline.support_meter(pollster.name): - polling_task = polling_tasks.get(pipeline.interval, None) + polling_task = polling_tasks.get(pipeline.interval) if not polling_task: polling_task = self.create_polling_task() polling_tasks[pipeline.interval] = polling_task diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 81f93c3c9..ec5c30bf6 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -102,7 +102,7 @@ class Client(object): image_metadata = getattr(image, 'metadata', None) for attr in ['kernel_id', 'ramdisk_id']: - ameta = image_metadata.get(attr, None) if image_metadata else None + ameta = image_metadata.get(attr) if image_metadata else None setattr(instance, attr, ameta) @logged diff --git a/ceilometer/service.py b/ceilometer/service.py index e7b2d7c55..637621844 100644 --- a/ceilometer/service.py +++ b/ceilometer/service.py @@ -63,7 +63,7 @@ CLI_OPTIONS = [ default=os.environ.get('OS_TENANT_NAME', 'admin'), help='Tenant name to use for OpenStack service access.'), cfg.StrOpt('os-cacert', - default=os.environ.get('OS_CACERT', None), + default=os.environ.get('OS_CACERT'), help='Certificate chain for SSL validation.'), cfg.StrOpt('os-auth-url', deprecated_group="DEFAULT", @@ -72,7 +72,7 @@ CLI_OPTIONS = [ help='Auth URL to use for OpenStack service access.'), cfg.StrOpt('os-region-name', deprecated_group="DEFAULT", - default=os.environ.get('OS_REGION_NAME', None), + default=os.environ.get('OS_REGION_NAME'), help='Region name to use for OpenStack service endpoints.'), cfg.StrOpt('os-endpoint-type', default=os.environ.get('OS_ENDPOINT_TYPE', 'publicURL'), diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/ceilometer/tests/storage/test_storage_scenarios.py index acfc2bf76..0f84582fb 100644 --- a/ceilometer/tests/storage/test_storage_scenarios.py +++ b/ceilometer/tests/storage/test_storage_scenarios.py @@ -2400,7 +2400,7 @@ class GetEventTest(EventTestBase): self.fail("Unexpected event ID returned:" % event.message_id) for trait in event.traits: - expected_val = trait_values.get(trait.name, None) + expected_val = trait_values.get(trait.name) if not expected_val: self.fail("Unexpected trait type: %s" % trait.dtype) self.assertEqual(expected_val, trait.value)