From f7ed7214c55fa97f4cc2e8b827d37ecee68f1d94 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Tue, 3 Dec 2013 12:36:31 +0100 Subject: [PATCH] timeside.analyzer.core.py : AnalyzeResultContainer : add method can handle update from AnalyzeResultContainer --- timeside/analyzer/core.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/timeside/analyzer/core.py b/timeside/analyzer/core.py index 0d49736..609bc94 100644 --- a/timeside/analyzer/core.py +++ b/timeside/analyzer/core.py @@ -806,13 +806,16 @@ class AnalyzerResultContainer(dict): self.add(analyzer_results) def add(self, analyzer_result): - if isinstance(analyzer_result, list): + if isinstance(analyzer_result, AnalyzerResultContainer): + self.update(analyzer_result) + return + elif isinstance(analyzer_result, list): for res in analyzer_result: self.add(res) return # Check result if not isinstance(analyzer_result, AnalyzerResult): - raise TypeError('only AnalyzerResult can be added') + raise TypeError('Only AnalyzerResult can be added') self.__setitem__(analyzer_result.id_metadata.id, analyzer_result) @@ -1011,7 +1014,7 @@ class Analyzer(Processor): from datetime import datetime result = AnalyzerResult.factory(data_mode=data_mode, - time_mode=time_mode) + time_mode=time_mode) # Automatically write known metadata result.id_metadata.date = datetime.now().replace( -- 2.39.5