[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 43baca1dd5f27b66664e91ebeb8f0ec8f870962b
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu Apr 25 23:14:50 2013 -0700

    Yield {}, not None, from empty elements
    
    Fixes TOOLS-306

diff --git a/euca2ools/commands/autoscaling/__init__.py b/euca2ools/commands/autoscaling/__init__.py
index e04b994..9fba08a 100644
--- a/euca2ools/commands/autoscaling/__init__.py
+++ b/euca2ools/commands/autoscaling/__init__.py
@@ -66,6 +66,6 @@ class AutoScalingRequest(requestbuilder.request.AWSQueryRequest):
         useful_keys = list(filter(lambda x: x != 'ResponseMetadata',
                                   response_dict.keys()))
         if len(useful_keys) == 1:
-            return response_dict[useful_keys[0]]
+            return response_dict[useful_keys[0]] or {}
         else:
             return response_dict
diff --git a/euca2ools/commands/elasticloadbalancing/__init__.py b/euca2ools/commands/elasticloadbalancing/__init__.py
index a088ab9..4600965 100644
--- a/euca2ools/commands/elasticloadbalancing/__init__.py
+++ b/euca2ools/commands/elasticloadbalancing/__init__.py
@@ -66,6 +66,6 @@ class ELBRequest(requestbuilder.request.AWSQueryRequest):
         useful_keys = list(filter(lambda x: x != 'ResponseMetadata',
                                   response_dict.keys()))
         if len(useful_keys) == 1:
-            return response_dict[useful_keys[0]]
+            return response_dict[useful_keys[0]] or {}
         else:
             return response_dict
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index b46086a..caf51e0 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -80,7 +80,7 @@ class EuareRequest(requestbuilder.request.AWSQueryRequest):
         useful_keys = list(filter(lambda x: x != 'ResponseMetadata',
                                   response_dict.keys()))
         if len(useful_keys) == 1:
-            return response_dict[useful_keys[0]]
+            return response_dict[useful_keys[0]] or {}
         else:
             return response_dict
 
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index c07c163..aa97000 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -205,7 +205,7 @@ class EucalyptusRequest(requestbuilder.request.AWSQueryRequest,
         # RequestId then just return its contents.
         useful_keys = filter(lambda x: x != 'RequestId', response.keys())
         if len(useful_keys) == 1:
-            return response[useful_keys[0]]
+            return response[useful_keys[0]] or {}
         else:
             return response
 
diff --git a/euca2ools/commands/monitoring/__init__.py b/euca2ools/commands/monitoring/__init__.py
index 05a25d7..28103ce 100644
--- a/euca2ools/commands/monitoring/__init__.py
+++ b/euca2ools/commands/monitoring/__init__.py
@@ -66,7 +66,7 @@ class CloudWatchRequest(requestbuilder.request.AWSQueryRequest):
         useful_keys = list(filter(lambda x: x != 'ResponseMetadata',
                                   response_dict.keys()))
         if len(useful_keys) == 1:
-            return response_dict[useful_keys[0]]
+            return response_dict[useful_keys[0]] or {}
         else:
             return response_dict
 

-- 
managing cloud instances for Eucalyptus