merging bugfixes from trunk

diff --git a/sfa/methods/get_aggregates.py b/sfa/methods/get_aggregates.py
index da9859a..384b0b6 100644 (file)
--- a/sfa/methods/get_aggregates.py
+++ b/sfa/methods/get_aggregates.py
@@ -39,8 +39,8 @@ class get_aggregates(Method):
                 hrn_list = hrn
         
         if not hrn_list:
-            interfaces = aggregates.interfaces
+            interfaces = aggregates.interfaces.keys()
         else:
-            interfaces = [interface for interface in aggregates.interfaces if interface['hrn'] in hrn_list]
+            interfaces = [interface for interface in aggregates.interfaces if interface in hrn_list]
       
         return interfaces

diff --git a/sfa/methods/get_registries.py b/sfa/methods/get_registries.py
index 9cbba39..082c5df 100644 (file)
--- a/sfa/methods/get_registries.py
+++ b/sfa/methods/get_registries.py
@@ -39,8 +39,8 @@ class get_registries(Method):
                 hrn_list = hrn
 
         if not hrn_list:
-            interfaces = registries.interfaces
+            interfaces = registries.interfaces.keys()
         else:
-            interfaces = [interface for interface in registries.interfaces if interface['hrn'] in hrn_list]
+            interfaces = [interface for interface in registries.interfaces if interface in hrn_list]
 
         return interfaces