Changeset 87716 in vbox

Timestamp:

Feb 11, 2021 7:54:41 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Attempting to make htmlhelp-qthelp.py Python 3 friendly.

File:

• trunk/doc/manual/htmlhelp-qthelp.py (modified) (10 diffs)

trunk/doc/manual/htmlhelp-qthelp.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # $Id$
 ## @file
-# A python 2.x script to create a .qhp file outof a given htmlhelp
+# A python script to create a .qhp file out of a given htmlhelp
 # folder. Lots of things about the said folder is assumed. Please
-# read the code and inlined comments.
+# see the code and inlined comments.
 
 import sys, getopt
@@ -12 +12 @@
 import codecs
 import logging
-from HTMLParser import HTMLParser
+
+if sys.version_info.major >= 3:
+    from html.parser import HTMLParser
+else:
+    from HTMLParser import HTMLParser
+
 
 __copyright__ = \
@@ -27 +32 @@
 """
 
-
 # number of opened and not yet closed section tags of toc section
 open_section_tags = 0
 
 html_files = []
-
-class html_parser(HTMLParser):
-  def __init__(self):
-    HTMLParser.__init__(self)
-    self.a_tag=[]
-
-  def handle_starttag(self, tag, attributes):
-    if tag != 'div' and tag != 'a':
-        return
-    if tag == 'a':
-        for a in attributes:
-            if a[0] == 'name':
-                self.a_tag.append(a[1])
 
 # use html_parser stuff to collect <a name tags
@@ -51 +42 @@
     for html_file_name in html_files:
         full_html_path = os.path.join(folder, html_file_name)
-        file_content = open(full_html_path, 'r').read()
+        file_content = codecs.open(full_html_path, encoding='iso-8859-1').read()
+
+        class html_parser(HTMLParser):
+          def __init__(self):
+            HTMLParser.__init__(self)
+            self.a_tag=[]
+          def handle_starttag(self, tag, attributes):
+            if tag != 'div' and tag != 'a':
+              return
+            if tag == 'a':
+              for a in attributes:
+                if a[0] == 'name':
+                  self.a_tag.append(a[1])
+
         parser = html_parser()
         parser.feed(file_content)
@@ -86 +90 @@
         return html_file_lines
     full_path = os.path.join(folder, 'htmlhelp.hhp')
-    file = open(full_path, "r")
+    file = codecs.open(full_path, encoding='iso-8859-1')
+
     lines = file.readlines()
     file.close()
@@ -135 +140 @@
         logging.warning('Skipping the line "%s" since next two tags are supposed to be param tags',  lines[index])
         return result
-
     title = parse_param_tag(lines[index + 1])
     ref = parse_param_tag(lines[index + 2])
@@ -175 +179 @@
 
 # parse toc.hhc file. assuming all the relevant information
-# is stored in tags and attributes. data "whatever is outside of
+# is stored in tags and attributes. whatever is outside of
 # <... > pairs is filtered out. we also assume < ..> are not nested
 # and each < matches to a >
@@ -218 +222 @@
 
 def usage(arg):
-    print 'htmlhelp-qthelp.py -d <helphtmlfolder> -o <outputfilename>'
-    sys.exit(arg)
+    print('htmlhelp-qthelp.py -d <helphtmlfolder> -o <outputfilename>')
+    sys.exit()
 
 def main(argv):
@@ -227 +231 @@
         opts, args = getopt.getopt(sys.argv[1:],"hd:o:")
     except getopt.GetoptError as err:
-        print err
+        print(err)
         usage(2)
     for opt, arg in opts:
@@ -260 +264 @@
     out_xml_lines += ['</filterSection>', '</QtHelpProject>']
 
-    out_file = open(output_filename, 'w')
+    out_file = open(output_filename, 'wb')
     out_file.write('\n'.join(out_xml_lines).encode('utf8'))
     out_file.close()