Merge cleanup

This commit is contained in:
Maximilien Rigaut 2017-05-05 22:00:21 +02:00
parent ae6ba71dd0
commit 4e58e37616
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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="| ")