Date: Mon, 28 Jan 2019 19:53:28 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491516 - head/graphics/opensubdiv/files Message-ID: <201901281953.x0SJrShO096280@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Jan 28 19:53:28 2019 New Revision: 491516 URL: https://svnweb.freebsd.org/changeset/ports/491516 Log: graphics/opensubdiv: Fix document generation when using Python 3.x as default PR: 234687 Submitted by: FreeBSD@ShaneWare.Biz (maintainer) Reported by: antoine Added: head/graphics/opensubdiv/files/patch-documentation_processHtml.py (contents, props changed) head/graphics/opensubdiv/files/patch-documentation_processTutorials.py (contents, props changed) Added: head/graphics/opensubdiv/files/patch-documentation_processHtml.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opensubdiv/files/patch-documentation_processHtml.py Mon Jan 28 19:53:28 2019 (r491516) @@ -0,0 +1,83 @@ +--- documentation/processHtml.py.orig 2018-07-18 02:17:49 UTC ++++ documentation/processHtml.py +@@ -25,9 +25,11 @@ + + import os + import sys +-import string + import re +-import HTMLParser ++try: ++ import HTMLParser ++except: ++ import html.parser as HTMLParser + + class HtmlToTextParser(HTMLParser.HTMLParser): + def __init__(self): +@@ -89,10 +91,10 @@ def ReadNavigationTemplate( filePath ): + try: + navFile = open( filePath, "r") + except IOError: +- print "Could not open file \'"+filePath+"\'" ++ print("Could not open file \'"+filePath+"\'") + + with navFile: +- print "Navigation template: \'"+filePath+"\'" ++ print("Navigation template: \'"+filePath+"\'") + navHtml = navFile.read() + navHtml = StripHTMLComments(navHtml) + navFile.close() +@@ -109,7 +111,7 @@ def WriteIndexFile( outputFile, content ): + except: + pass + +- print "Creating Search-Index File : \""+outputFile+"\"" ++ print("Creating Search-Index File : \""+outputFile+"\"") + + f = open(outputFile, "w") + f.write(content) +@@ -117,7 +119,7 @@ def WriteIndexFile( outputFile, content ): + + #------------------------------------------------------------------------------- + def Usage(): +- print str(sys.argv[0])+" <input directory> <output directory> <html template>" ++ print(str(sys.argv[0])+" <input directory> <output directory> <html template>") + exit(1); + + +@@ -132,7 +134,7 @@ navTemplate = str(sys.argv[2]) + + navHtml = ReadNavigationTemplate( navTemplate ) + +-print "Scanning : \'"+rootDir+"\'" ++print("Scanning : \'"+rootDir+"\'") + + searchIndex = 'var tipuesearch = { "pages": [ ' + +@@ -172,22 +174,22 @@ for root, dirs, files in os.walk(rootDir): + + # if necessary, insert navigation html + if (not parser.HasNavigationSection()): +- loc = string.find(html,"<body>") ++ loc = html.find("<body>") + html = html[:loc+6] + navHtml + html[loc+6:] + + msg += "added navigation" + + # replace the article title placeholder with the real title + if title: +- html = string.replace(html,"OSD_ARTICLE_TITLE", title) ++ html = html.replace("OSD_ARTICLE_TITLE", title) + else: +- html = string.replace(html,"OSD_ARTICLE_TITLE", "") ++ html = html.replace("OSD_ARTICLE_TITLE", "") + + f.seek(0) + f.write(html) + f.close() + +- print msg ++ print(msg) + + searchIndex = searchIndex + "]};" + Added: head/graphics/opensubdiv/files/patch-documentation_processTutorials.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opensubdiv/files/patch-documentation_processTutorials.py Mon Jan 28 19:53:28 2019 (r491516) @@ -0,0 +1,29 @@ +--- documentation/processTutorials.py.orig 2019-01-13 21:35:49 UTC ++++ documentation/processTutorials.py +@@ -33,7 +33,7 @@ def ReadFile(inputfile): + try: + f = open( inputfile, "r") + except IOError: +- print "Could not read file \'"+inputfile+"\'" ++ print("Could not read file \'"+inputfile+"\'") + content = f.read() + f.close() + return content +@@ -48,7 +48,7 @@ def WriteToFile(outputfile, content): + try: + f = open(outputfile, "w") + except IOError: +- print "Could not write file \'"+outputfile+"\'" ++ print("Could not write file \'"+outputfile+"\'") + f.write(content) + f.close() + +@@ -85,7 +85,7 @@ def Process(srcfile, title): + + #------------------------------------------------------------------------------- + def Usage(): +- print str(sys.argv[0])+" <input file> <output file> <title>" ++ print(str(sys.argv[0])+" <input file> <output file> <title>") + exit(1); + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901281953.x0SJrShO096280>