openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Remove None for dict.get()"

Browse Source
This commit is contained in:
Jenkins
2014-02-18 11:40:22 +00:00
committed by Gerrit Code Review
parent 39f13fa706 eb186fd186
commit a361009b22
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/agent.py
View File

@@ -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

2
ceilometer/nova_client.py
View File

@@ -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

4
ceilometer/service.py
View File

@@ -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'),

2
ceilometer/tests/storage/test_storage_scenarios.py
View File

@@ -2441,7 +2441,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)