memory: factorize the node checks in Params.__constructProfileXml
This commit is contained in:
parent
9dc518a2a9
commit
78a3d845db
1 changed files with 6 additions and 7 deletions
|
|
@ -533,6 +533,10 @@ class Params(object):
|
||||||
@return: a deferred that fire a minidom.Document of the profile xml (cf warning above)
|
@return: a deferred that fire a minidom.Document of the profile xml (cf warning above)
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
def checkNode(node):
|
||||||
|
"""Check the node against security_limit and app"""
|
||||||
|
return self.checkSecurityLimit(node, security_limit) and self.checkApp(node, app)
|
||||||
|
|
||||||
def constructProfile(ignore, profile_cache):
|
def constructProfile(ignore, profile_cache):
|
||||||
# init the result document
|
# init the result document
|
||||||
prof_xml = minidom.parseString('<params/>')
|
prof_xml = minidom.parseString('<params/>')
|
||||||
|
|
@ -553,10 +557,7 @@ class Params(object):
|
||||||
for node in dest_cat.childNodes:
|
for node in dest_cat.childNodes:
|
||||||
if node.nodeName != "param":
|
if node.nodeName != "param":
|
||||||
continue
|
continue
|
||||||
if not self.checkSecurityLimit(node, security_limit):
|
if not checkNode(node):
|
||||||
dest_cat.removeChild(node)
|
|
||||||
continue
|
|
||||||
if not self.checkApp(node, app):
|
|
||||||
dest_cat.removeChild(node)
|
dest_cat.removeChild(node)
|
||||||
continue
|
continue
|
||||||
dest_params[node.getAttribute('name')] = node
|
dest_params[node.getAttribute('name')] = node
|
||||||
|
|
@ -571,9 +572,7 @@ class Params(object):
|
||||||
# we have to merge new params (we are parsing individual parameters, we have to add them
|
# we have to merge new params (we are parsing individual parameters, we have to add them
|
||||||
# to the previously parsed general ones)
|
# to the previously parsed general ones)
|
||||||
name = param_node.getAttribute('name')
|
name = param_node.getAttribute('name')
|
||||||
if not self.checkSecurityLimit(param_node, security_limit):
|
if not checkNode(param_node):
|
||||||
continue
|
|
||||||
if not self.checkApp(param_node, app):
|
|
||||||
continue
|
continue
|
||||||
if name not in dest_params:
|
if name not in dest_params:
|
||||||
# this is reached when a previous category exists
|
# this is reached when a previous category exists
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue