mirror of https://github.com/Malphaet/vkyweb.git
Merge cleanup
This commit is contained in:
parent
ae6ba71dd0
commit
4e58e37616
|
|
@ -39,8 +39,6 @@ class WebPage(object):
|
||||||
def get_next_line(self,filter_lang="*"):
|
def get_next_line(self,filter_lang="*"):
|
||||||
"Get a line of text, with a filter if needed"
|
"Get a line of text, with a filter if needed"
|
||||||
for line,lang in self.content:
|
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):
|
if self.match_with_lang(lang,filter_lang):
|
||||||
yield line
|
yield line
|
||||||
|
|
||||||
|
|
|
||||||
6
test.py
6
test.py
|
|
@ -173,12 +173,14 @@ class testTree(simple):
|
||||||
self.addSucess()
|
self.addSucess()
|
||||||
|
|
||||||
self.currentTest="tree:Poetry:content"
|
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()
|
self.addSucess()
|
||||||
else:
|
else:
|
||||||
self.addFailure("can't load content")
|
self.addFailure("can't load content")
|
||||||
|
|
||||||
|
|
||||||
|
#webt.print_webtree('en')
|
||||||
|
|
||||||
testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42)
|
testVky=group(name="vkyWeb_all",terminal=term,verbose=1,align=42)
|
||||||
#testConfig=group(name="config",terminal=term,prefix="| ")
|
#testConfig=group(name="config",terminal=term,prefix="| ")
|
||||||
#testParser=group(name="parser",terminal=term,prefix="| ")
|
#testParser=group(name="parser",terminal=term,prefix="| ")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue