From 3aa86e98cffecb0db061c33a6d298b6ad2252ad9 Mon Sep 17 00:00:00 2001 From: zhang-jinnan Date: Wed, 19 Feb 2014 20:53:57 +0800 Subject: [PATCH] Remove None for dict.get() Because If no default value is specified it defaults to None already. Change-Id: I1ca522c7eebb2171d1a3efd35680ce42b89237b5 --- heatclient/common/utils.py | 2 +- heatclient/openstack/common/apiclient/exceptions.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/heatclient/common/utils.py b/heatclient/common/utils.py index fbd4d8da..6e93c7f8 100644 --- a/heatclient/common/utils.py +++ b/heatclient/common/utils.py @@ -123,7 +123,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', '') diff --git a/heatclient/openstack/common/apiclient/exceptions.py b/heatclient/openstack/common/apiclient/exceptions.py index b364d60d..45a70e0a 100644 --- a/heatclient/openstack/common/apiclient/exceptions.py +++ b/heatclient/openstack/common/apiclient/exceptions.py @@ -422,8 +422,8 @@ def from_response(response, method, url): else: if hasattr(body, "keys"): error = body[body.keys()[0]] - kwargs["message"] = error.get("message", None) - kwargs["details"] = error.get("details", None) + kwargs["message"] = error.get("message") + kwargs["details"] = error.get("details") elif content_type.startswith("text/"): kwargs["details"] = response.text