Changeset 242637 in webkit
- Timestamp:
- Mar 7, 2019 11:11:39 PM (5 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r242632 r242637 1 2019-03-07 Tomas Popela <tpopela@redhat.com> 2 3 [GTK] Make Tools/gtkdoc python3 compatible 4 https://bugs.webkit.org/show_bug.cgi?id=195359 5 6 Reviewed by Carlos Garcia Campos. 7 8 * gtkdoc/generate-gtkdoc: 9 ConfigParser was reworked in Python 3.2 so we have adapt the code to 10 work with Python 2 and 3. 11 (get_gtkdoc_module_paths): 12 The iteritems() was removed in Python 3, so let's use items() that's 13 available in Python 2 and 3. 14 (get_generator_for_config): 15 * gtkdoc/gtkdoc.py: 16 (GTKDoc._run_command): 17 The sys.stdout.write() is expecting str in Python 3 and not bytes 18 (that are coming from stdout.encode()). Use sys.stdout.buffer.write() 19 for passing the bytes there. 20 1 21 2019-03-07 Fujii Hironori <Hironori.Fujii@sony.com> 2 22 -
trunk/Tools/gtkdoc/generate-gtkdoc
r238853 r242637 17 17 18 18 from __future__ import print_function 19 from ConfigParser import SafeConfigParser20 19 21 20 import argparse … … 27 26 import sys 28 27 28 if sys.version_info < (3, 2): 29 from ConfigParser import SafeConfigParser as ConfigParser 30 else: 31 from configparser import ConfigParser 32 29 33 top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..')) 30 34 sys.path.insert(0, os.path.join(top_level_directory, 'Tools', 'glib')) 31 35 import common 32 36 33 sys.stdout = codecs.getwriter("utf-8")(sys.stdout) 34 sys.stderr = codecs.getwriter("utf-8")(sys.stderr) 37 if sys.version_info.major == 2: 38 sys.stdout = codecs.getwriter("utf-8")(sys.stdout) 39 sys.stderr = codecs.getwriter("utf-8")(sys.stderr) 35 40 36 41 def configure_logging(verbose): … … 58 63 paths = [] 59 64 html_dir = os.path.join('share', 'gtk-doc', 'html') 60 for package, modules in dependent_packages.ite ritems():65 for package, modules in dependent_packages.items(): 61 66 prefix = common.prefix_of_pkg_config_file(package) 62 67 if prefix is None: … … 110 115 return None 111 116 112 config = SafeConfigParser()117 config = ConfigParser() 113 118 config.read(config_file) 114 119 module_name = config.sections()[0] -
trunk/Tools/gtkdoc/gtkdoc.py
r238853 r242637 200 200 if stdout: 201 201 try: 202 sys.stdout.write(stdout.encode("utf-8")) 202 if sys.version_info.major == 2: 203 sys.stdout.write(stdout.encode("utf-8")) 204 else: 205 sys.stdout.buffer.write(stdout.encode("utf-8")) 203 206 except UnicodeDecodeError: 204 207 sys.stdout.write(stdout) 205 208 if stderr: 206 209 try: 207 sys.stderr.write(stderr.encode("utf-8")) 210 if sys.version_info.major == 2: 211 sys.stderr.write(stderr.encode("utf-8")) 212 else: 213 sys.stderr.buffer.write(stderr.encode("utf-8")) 208 214 except UnicodeDecodeError: 209 215 sys.stderr.write(stderr)
Note: See TracChangeset
for help on using the changeset viewer.