From 4e58e376167c4abc2562d681dcd4e2e2e78a4e20 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Fri, 5 May 2017 22:00:21 +0200 Subject: [PATCH] Merge cleanup --- generator/file_parser.py | 2 -- test.py | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/file_parser.py b/generator/file_parser.py index d6804fb..8fe8b83 100644 --- a/generator/file_parser.py +++ b/generator/file_parser.py @@ -39,8 +39,6 @@ class WebPage(object): def get_next_line(self,filter_lang="*"): "Get a line of text, with a filter if needed" for line,lang in self.content: - if line.find("rose")>0: - print lang,line,filter_lang,self.match_with_lang(lang,filter_lang) if self.match_with_lang(lang,filter_lang): yield line diff --git a/test.py b/test.py index bde64ca..c1fe83b 100644 --- a/test.py +++ b/test.py @@ -173,12 +173,14 @@ class testTree(simple): self.addSucess() self.currentTest="tree:Poetry:content" - if poem1.get_content("fr")=="Une rose qui passe\nQuelle est bien belle\nMais pourquoi donc\nEsceque tu est jolie": + poem1content=poem1.get_content("fr").split("\n") + if poem1content==["Une rose qui passe","Quelle est bien belle","Mais pourquoi donc","Esceque tu est jolie",""]: self.addSucess() else: self.addFailure("can't load content") - + #webt.print_webtree('en') + testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42) #testConfig=group(name="config",terminal=term,prefix="| ") #testParser=group(name="parser",terminal=term,prefix="| ")