Title: [242876] releases/WebKitGTK/webkit-2.24/Tools
- Revision
- 242876
- Author
- [email protected]
- Date
- 2019-03-13 02:25:38 -0700 (Wed, 13 Mar 2019)
Log Message
Merge r242637 - [GTK] Make Tools/gtkdoc python3 compatible
https://bugs.webkit.org/show_bug.cgi?id=195359
Reviewed by Carlos Garcia Campos.
* gtkdoc/generate-gtkdoc:
ConfigParser was reworked in Python 3.2 so we have adapt the code to
work with Python 2 and 3.
(get_gtkdoc_module_paths):
The iteritems() was removed in Python 3, so let's use items() that's
available in Python 2 and 3.
(get_generator_for_config):
* gtkdoc/gtkdoc.py:
(GTKDoc._run_command):
The sys.stdout.write() is expecting str in Python 3 and not bytes
(that are coming from stdout.encode()). Use sys.stdout.buffer.write()
for passing the bytes there.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Tools/ChangeLog (242875 => 242876)
--- releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-03-13 09:25:35 UTC (rev 242875)
+++ releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-03-13 09:25:38 UTC (rev 242876)
@@ -1,3 +1,23 @@
+2019-03-07 Tomas Popela <[email protected]>
+
+ [GTK] Make Tools/gtkdoc python3 compatible
+ https://bugs.webkit.org/show_bug.cgi?id=195359
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtkdoc/generate-gtkdoc:
+ ConfigParser was reworked in Python 3.2 so we have adapt the code to
+ work with Python 2 and 3.
+ (get_gtkdoc_module_paths):
+ The iteritems() was removed in Python 3, so let's use items() that's
+ available in Python 2 and 3.
+ (get_generator_for_config):
+ * gtkdoc/gtkdoc.py:
+ (GTKDoc._run_command):
+ The sys.stdout.write() is expecting str in Python 3 and not bytes
+ (that are coming from stdout.encode()). Use sys.stdout.buffer.write()
+ for passing the bytes there.
+
2019-03-04 Carlos Garcia Campos <[email protected]>
[GLib] Returning G_TYPE_OBJECT from a constructor does not work
Modified: releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/generate-gtkdoc (242875 => 242876)
--- releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/generate-gtkdoc 2019-03-13 09:25:35 UTC (rev 242875)
+++ releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/generate-gtkdoc 2019-03-13 09:25:38 UTC (rev 242876)
@@ -16,7 +16,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
from __future__ import print_function
-from ConfigParser import SafeConfigParser
import argparse
import codecs
@@ -26,12 +25,18 @@
import os.path
import sys
+if sys.version_info < (3, 2):
+ from ConfigParser import SafeConfigParser as ConfigParser
+else:
+ from configparser import ConfigParser
+
top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
sys.path.insert(0, os.path.join(top_level_directory, 'Tools', 'glib'))
import common
-sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
-sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
+if sys.version_info.major == 2:
+ sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
+ sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
def configure_logging(verbose):
level = logging.DEBUG if verbose else logging.INFO
@@ -57,7 +62,7 @@
paths = []
html_dir = os.path.join('share', 'gtk-doc', 'html')
- for package, modules in dependent_packages.iteritems():
+ for package, modules in dependent_packages.items():
prefix = common.prefix_of_pkg_config_file(package)
if prefix is None:
continue
@@ -109,7 +114,7 @@
if not os.path.isfile(config_file):
return None
- config = SafeConfigParser()
+ config = ConfigParser()
config.read(config_file)
module_name = config.sections()[0]
pkgconfig_file = config.get(module_name, 'pkgconfig_file')
Modified: releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/gtkdoc.py (242875 => 242876)
--- releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/gtkdoc.py 2019-03-13 09:25:35 UTC (rev 242875)
+++ releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/gtkdoc.py 2019-03-13 09:25:38 UTC (rev 242876)
@@ -199,12 +199,18 @@
if print_output:
if stdout:
try:
- sys.stdout.write(stdout.encode("utf-8"))
+ if sys.version_info.major == 2:
+ sys.stdout.write(stdout.encode("utf-8"))
+ else:
+ sys.stdout.buffer.write(stdout.encode("utf-8"))
except UnicodeDecodeError:
sys.stdout.write(stdout)
if stderr:
try:
- sys.stderr.write(stderr.encode("utf-8"))
+ if sys.version_info.major == 2:
+ sys.stderr.write(stderr.encode("utf-8"))
+ else:
+ sys.stderr.buffer.write(stderr.encode("utf-8"))
except UnicodeDecodeError:
sys.stderr.write(stderr)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
