diff options
Diffstat (limited to 'roverlay/metadata')
| -rw-r--r-- | roverlay/metadata/__init__.py | 1 | ||||
| -rw-r--r-- | roverlay/metadata/abstractnodes.py | 5 | ||||
| -rw-r--r-- | roverlay/metadata/nodes.py | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/roverlay/metadata/__init__.py b/roverlay/metadata/__init__.py index 074cce3..8d94325 100644 --- a/roverlay/metadata/__init__.py +++ b/roverlay/metadata/__init__.py @@ -13,7 +13,6 @@ class MetadataJob ( object ): """Initializes a MetadataJob. arguments: - (((* package_info -- reserved for future usage))) * logger -- parent logger to use """ self.logger = logger.getChild ( 'metadata' ) diff --git a/roverlay/metadata/abstractnodes.py b/roverlay/metadata/abstractnodes.py index 50c9f56..f5a5c31 100644 --- a/roverlay/metadata/abstractnodes.py +++ b/roverlay/metadata/abstractnodes.py @@ -130,9 +130,9 @@ class MetadataNode ( _MetadataBasicNode ): def _nodelist ( self ): """Returns a list of strings representing the child nodes.""" - return list ( + return tuple ( filter ( - None, + lambda k: k is not None, [ node.to_str() for node in self.nodes if node.active() ] ), ) @@ -141,7 +141,6 @@ class MetadataNode ( _MetadataBasicNode ): def _nodestr ( self ): """Returns a string representing all child nodes.""" self._sort_nodes() - # todo filter only None? node_repr = self._nodelist() if len ( node_repr ): # add newlines before/after and indent after node_repr! diff --git a/roverlay/metadata/nodes.py b/roverlay/metadata/nodes.py index f35f8da..4d4d5fd 100644 --- a/roverlay/metadata/nodes.py +++ b/roverlay/metadata/nodes.py @@ -108,13 +108,12 @@ class DescriptionNode ( MetadataLeaf ): arguments: * description -- description text * is_long -- if this is a longdescription or a description node - * linewidth -- max text line width, TODO/FIXME: is this ignored? + * linewidth -- max text line width """ super ( DescriptionNode, self ) . __init__ ( 'longdescription' if is_long else 'description', value=description, ) - # self.value_format = "break lines after 80c, ..." if not linewidth is None and linewidth > 0: self.linewidth = linewidth @@ -163,9 +162,8 @@ class UseFlagListNode ( MetadataNode ): one UseFlag child node is active. """ # generator should stop after first True - # todo/fixme: could use super ( UseFlagListNode, self ).active() instead - # of self._enabled - return True in ( node.active() for node in self.nodes ) and self._enabled + return self._enabled and \ + True in ( node.active() for node in self.nodes ) # --- end of active (...) --- def _sort_nodes ( self ): |