Merge "Replace functions 'Dict.get' and 'del' with 'Dict.pop'"

1 files changed, 3 insertions, 6 deletions

diff --git a/heatclient/openstack/common/apiclient/client.py b/heatclient/openstack/common/apiclient/client.py
index 24c6e73..8733772 100644
--- a/heatclient/openstack/common/apiclient/client.py
+++ b/heatclient/openstack/common/apiclient/client.py
@@ -145,13 +145,10 @@ class HTTPClient(object):
                 resp.text)
 
     def serialize(self, kwargs):
-        if kwargs.get('json') is not None:
+        json_data = kwargs.pop('json', None)
+        if json_data is not None:
             kwargs['headers']['Content-Type'] = 'application/json'
-            kwargs['data'] = json.dumps(kwargs['json'])
-        try:
-            del kwargs['json']
-        except KeyError:
-            pass
+            kwargs['data'] = json.dumps(json_data)
 
     def get_timings(self):
         return self.times