From 24314d9b3ecbcc4dda49afef68e5ecc29e468fd1 Mon Sep 17 00:00:00 2001 From: Maximilien Rigaut Date: Sat, 6 May 2017 14:30:16 +0200 Subject: [PATCH] Made python3 compliantish --- generator/file_parser.py | 25 ++++++++++--------------- generator/model.py | 14 ++++++++++---- generator/model/dual.py | 4 ++-- generator/model_legacy.py | 21 +++++++++++++-------- generator/tree_parser.py | 39 ++++++++++++++++----------------------- minitest | 2 +- site_base/dual/test.html | 4 ++-- test.py | 4 ++-- 8 files changed, 56 insertions(+), 57 deletions(-) diff --git a/generator/file_parser.py b/generator/file_parser.py index 8fe8b83..e58f390 100644 --- a/generator/file_parser.py +++ b/generator/file_parser.py @@ -2,7 +2,7 @@ # coding=utf-8 -import os,sys,tree_parser +import os,sys import re import traceback @@ -153,8 +153,8 @@ def parse_file(file_name): page.add_content(text,line_langs) except re.error: - print "Error parsing",file_name,"contain a non parsable line:" - print " >",line + print("Error parsing",file_name,"contain a non parsable line:") + print(" >",line) except: traceback.print_exc() page.list_of_lang.update(used_langs) # Not sure this fix is actually a good idea, could just force adding langs in variables @@ -164,18 +164,13 @@ re_config_line=re.compile("(?P.+): (?P.*)") re_text_line=re.compile("__(?P[\*\w]+)__|__/(?P[\*\w]+)__|(?P.*)") if __name__ == '__main__': + import tree_parser config=parse_file("sites/example_website/_config.txt") index=parse_file("sites/example_website/index.txt") - #print config.variables - #print config.list_of_lang - #print config.content - #for l in config.get_next_line("*"): - # print l - #print index.content - print "All text only" - print index.get_text("*") - print "Fr text only" - print index.get_text("fr") - print "En text only" - print index.get_text("en") + print("All text only") + print(index.get_text("*")) + print("Fr text only") + print(index.get_text("fr")) + print("En text only") + print(index.get_text("en")) diff --git a/generator/model.py b/generator/model.py index c7be69a..a2fac50 100644 --- a/generator/model.py +++ b/generator/model.py @@ -1,9 +1,15 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. # coding=utf-8 -from tree_parser import * -from model import dual + import re,traceback +try: + from tree_parser import * + from model import dual +except: + from generator.model import dual + from generator import tree_parser + def getDataType(name): "Return some kind of general types depending on the extention" ext=os.path.splitext(name)[-1] @@ -11,7 +17,7 @@ def getDataType(name): "audio":[".ogg",".aiff",".mp3"], "text":[".txt",".md"], "video":[".mov",".mp4"]} - for typename,extension in data.iteritems(): + for typename,extension in data.items(): if ext in extension: return typename return "other" @@ -41,4 +47,4 @@ if __name__ == '__main__': page=makePage(dual,site,lang,menu,data) with open("site_base/dual/test.html","w+") as f: f.write(page) - print page + print(page) diff --git a/generator/model/dual.py b/generator/model/dual.py index 6af1d46..e75db64 100644 --- a/generator/model/dual.py +++ b/generator/model/dual.py @@ -98,7 +98,7 @@ def geticon(datatype): def menuitem(text,link,datatype): "Generate a menu link" - print datatype + print (datatype) return """
  • {text}
  • """.format(text=text,link=link,datatype=geticon(datatype)) def makeSubNodelist(subnode,lang,getdatatype): @@ -107,7 +107,7 @@ def makeSubNodelist(subnode,lang,getdatatype): if node.name[0]!="_": items.append(menuitem(node.get_title(lang),node.path,getdatatype(node.path))) for node in subnode.get_next_subtree(): - #print node,node.name + #print(node,node.name) if node.name[0]!="_": items.append(menuitem(node.get_title(lang),node.path,"folder")) return items diff --git a/generator/model_legacy.py b/generator/model_legacy.py index d83538f..998dc79 100644 --- a/generator/model_legacy.py +++ b/generator/model_legacy.py @@ -1,8 +1,12 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. # coding=utf-8 -from tree_parser import * + import re,traceback +try: + from tree_parser import * +except: + from generator.tree_parser import * re_vars=re.compile(".*\#_(?P.*)_\#") @@ -20,12 +24,12 @@ class HTMLPage(object): with open(path) as a: self.model=a.read() except: - print "Error loading model" + print( "Error loading model") def replace(self,lang): self.html="" for line in self.model.splitlines(): - #print line + #print (line) try: variable=re_vars.match(line).groups()[0] if variable!=None: @@ -33,10 +37,10 @@ class HTMLPage(object): except AttributeError: pass except: - print traceback.print_exc() + print( traceback.print_exc()) self.html+=line self.html+=os.linesep - #print self.html + #print( self.html) def export(self): "Generate the HTML code and output it" @@ -75,14 +79,15 @@ def DataType(ext): "text":[".txt",".md"], "video":[".mov",".mp4"]} for typename,extension in data.iteritems(): + print typename,extension if ext in extension: return typename return None def makeContainer(node): c=DualContainer(node.name,node) - #print node.variables - #print node.config_file + #print (node.variables) + #print( node.config_file) c.load("generator/model/dual_menu.html") c.replace("fr") return c @@ -99,7 +104,7 @@ def makePage(node,cont,data): c.replace('fr') cont_t=cont.export() data_t=data.export() - print c.export().replace("##PAGE##",data_t).replace("##MENU##",cont_t) + print( c.export().replace("##PAGE##",data_t).replace("##MENU##",cont_t)) if __name__ == '__main__': site=makeWebsite("sites/example_website") diff --git a/generator/tree_parser.py b/generator/tree_parser.py index ebee14c..a0579e1 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -1,6 +1,12 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. -import os,sys,file_parser -from model import dual +import os,sys + +try: + from generator import file_parser + from generator.model import dual +except: + import file_parser + from model import dual class WebTree(object): "The tree of all website evolves during runtime as the files are requested" @@ -50,7 +56,7 @@ class WebTree(object): def print_webtree(self,lang="en",prefix=""): "Print a representation of the Tree" - print self + print (self) self.tree.print_webtree(lang,prefix) def __repr__(self): @@ -106,8 +112,8 @@ class WebSubTree(WebTree): new=WebNode(self.website_path,path) new.parent_node=self self.nodes=file_parser.add_to_table(var,lang,new,self.nodes) - #print self, self.subtree - #print self.nodes + #print( self, self.subtree) + #print( self.nodes) def get_next_nodes(self,filter_lang="*"): "Get all nodes in the following language" @@ -145,27 +151,13 @@ class WebSubTree(WebTree): def print_webtree(self,lang="en",prefix=""): "Print the tree and recurse" - #print self.get_next_subtree(lang) - # for item,langs in self.nodes.iteritems(): - # for lang,node in langs.iteritems(): # There is a proper way do this, it ain't this one - # #print node - # #print self.get_content(node,lang) - # print "{} [{}] {}".format(prefix,lang,node) - # print prefix+" +-----------" - # print "{} | {}".format(prefix,node.get_content(lang)) - # - # for item,langs in self.subtree.iteritems(): - # for lang,node in langs.iteritems(): - # print "{} [{}] {}".format(prefix,lang,node) - # node.print_webtree(lang,prefix+" ") - #print self for node in self.get_next_nodes(lang): - print "{} [{}] {}".format(prefix,lang,node) - print prefix+" +-----------" + print( "{} [{}] {}".format(prefix,lang,node)) + print( prefix+" +-----------") newL="\n{} [{}] | ".format(prefix,lang) - print "{} [{}] | {}".format(prefix,lang,node.get_content(lang).replace('\n',newL)) + print ("{} [{}] | {}".format(prefix,lang,node.get_content(lang).replace('\n',newL))) for tree in self.get_next_subtree(lang): - print "{} [{}] {}".format(prefix,lang,node) + print( "{} [{}] {}".format(prefix,lang,node)) tree.print_webtree(lang,prefix+" ") class WebNode(WebSubTree): @@ -215,6 +207,7 @@ def makeWebsite(website): raise IOError("Unable to find the specified website") if __name__ == '__main__': + import file_parser # Do all the nominal tests s=makeWebsite("sites/example_website") s.print_webtree("en"," > ") diff --git a/minitest b/minitest index 808b0bd..2e73040 160000 --- a/minitest +++ b/minitest @@ -1 +1 @@ -Subproject commit 808b0bd20a6ad8d14f806f6549365366dc348325 +Subproject commit 2e73040ab7d6523d1bf54d8962a3e703032be8db diff --git a/site_base/dual/test.html b/site_base/dual/test.html index d53ae1c..cde80ac 100644 --- a/site_base/dual/test.html +++ b/site_base/dual/test.html @@ -3,7 +3,7 @@ - Mouaulande + Mulehollande @@ -45,7 +45,7 @@ diff --git a/test.py b/test.py index c1fe83b..c90774a 100644 --- a/test.py +++ b/test.py @@ -74,7 +74,7 @@ class testParser(simple): if len(content_by_lang[l])!=len(generator_table): self.addFailure("generator and model don't have the same length [{}]".format(l)) succes=False - for i in xrange(len(generator_table)): + for i in range(len(generator_table)): if generator_table[i]!=content_by_lang[l][i]: self.addFailure("generator and model have different content [{}:{}]".format(l,i)) succes=False @@ -180,7 +180,7 @@ class testTree(simple): 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="| ")