From 97cef458386e955dcef86c75d05ffedda79bc054 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 11 May 2010 19:17:43 +0000 Subject: [PATCH] merging bugfixes from trunk --- sfa/methods/get_aggregates.py | 4 ++-- sfa/methods/get_registries.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sfa/methods/get_aggregates.py b/sfa/methods/get_aggregates.py index da9859a9..384b0b60 100644 --- 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 9cbba391..082c5df8 100644 --- 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 -- 2.43.0