openstack/nova
Code Issues Proposed changes

Merge "Remove unused expected_sub_attrs"

Browse Source
This commit is contained in:
Jenkins 2013-10-29 20:19:45 +00:00 committed by Gerrit Code Review
commit 864681ee27
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/objects/security_group_rule.py
View File

@ -42,12 +42,9 @@ class SecurityGroupRule(base.NovaPersistentObject, base.NovaObject):
context, security_group.SecurityGroup(), db_group) context, security_group.SecurityGroup(), db_group)
@staticmethod @staticmethod
def _from_db_object(context, rule, db_rule, expected_attrs=None, def _from_db_object(context, rule, db_rule, expected_attrs=None):
expected_sub_attrs=None):
if expected_attrs is None: if expected_attrs is None:
expected_attrs = [] expected_attrs = []
if expected_sub_attrs is None:
expected_sub_attrs = {}
for field in rule.fields: for field in rule.fields:
if field in expected_attrs: if field in expected_attrs:
rule[field] = rule._from_db_subgroup(context, db_rule[field]) rule[field] = rule._from_db_subgroup(context, db_rule[field])