<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[242876] releases/WebKitGTK/webkit-2.24/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/242876">242876</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-13 02:25:38 -0700 (Wed, 13 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242637">r242637</a> - [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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224ToolsChangeLog">releases/WebKitGTK/webkit-2.24/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224Toolsgtkdocgenerategtkdoc">releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/generate-gtkdoc</a></li>
<li><a href="#releasesWebKitGTKwebkit224Toolsgtkdocgtkdocpy">releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/gtkdoc.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Tools/ChangeLog (242875 => 242876)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2019-03-07  Tomas Popela  <tpopela@redhat.com>
+
+        [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.
+
</ins><span class="cx"> 2019-03-04  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GLib] Returning G_TYPE_OBJECT from a constructor does not work
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224Toolsgtkdocgenerategtkdoc"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/generate-gtkdoc (242875 => 242876)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
</span><span class="cx"> 
</span><span class="cx"> from __future__ import print_function
</span><del>-from ConfigParser import SafeConfigParser
</del><span class="cx"> 
</span><span class="cx"> import argparse
</span><span class="cx"> import codecs
</span><span class="lines">@@ -26,12 +25,18 @@
</span><span class="cx"> import os.path
</span><span class="cx"> import sys
</span><span class="cx"> 
</span><ins>+if sys.version_info < (3, 2):
+    from ConfigParser import SafeConfigParser as ConfigParser
+else:
+    from configparser import ConfigParser
+
</ins><span class="cx"> top_level_directory = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
</span><span class="cx"> sys.path.insert(0, os.path.join(top_level_directory, 'Tools', 'glib'))
</span><span class="cx"> import common
</span><span class="cx"> 
</span><del>-sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
-sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
</del><ins>+if sys.version_info.major == 2:
+    sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
+    sys.stderr = codecs.getwriter("utf-8")(sys.stderr)
</ins><span class="cx"> 
</span><span class="cx"> def configure_logging(verbose):
</span><span class="cx">     level = logging.DEBUG if verbose else logging.INFO
</span><span class="lines">@@ -57,7 +62,7 @@
</span><span class="cx"> 
</span><span class="cx">     paths = []
</span><span class="cx">     html_dir = os.path.join('share', 'gtk-doc', 'html')
</span><del>-    for package, modules in dependent_packages.iteritems():
</del><ins>+    for package, modules in dependent_packages.items():
</ins><span class="cx">         prefix = common.prefix_of_pkg_config_file(package)
</span><span class="cx">         if prefix is None:
</span><span class="cx">             continue
</span><span class="lines">@@ -109,7 +114,7 @@
</span><span class="cx">     if not os.path.isfile(config_file):
</span><span class="cx">         return None
</span><span class="cx"> 
</span><del>-    config = SafeConfigParser()
</del><ins>+    config = ConfigParser()
</ins><span class="cx">     config.read(config_file)
</span><span class="cx">     module_name = config.sections()[0]
</span><span class="cx">     pkgconfig_file = config.get(module_name, 'pkgconfig_file')
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224Toolsgtkdocgtkdocpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Tools/gtkdoc/gtkdoc.py (242875 => 242876)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -199,12 +199,18 @@
</span><span class="cx">         if print_output:
</span><span class="cx">             if stdout:
</span><span class="cx">                 try:
</span><del>-                    sys.stdout.write(stdout.encode("utf-8"))
</del><ins>+                    if sys.version_info.major == 2:
+                        sys.stdout.write(stdout.encode("utf-8"))
+                    else:
+                        sys.stdout.buffer.write(stdout.encode("utf-8"))
</ins><span class="cx">                 except UnicodeDecodeError:
</span><span class="cx">                     sys.stdout.write(stdout)
</span><span class="cx">             if stderr:
</span><span class="cx">                 try:
</span><del>-                    sys.stderr.write(stderr.encode("utf-8"))
</del><ins>+                    if sys.version_info.major == 2:
+                        sys.stderr.write(stderr.encode("utf-8"))
+                    else:
+                        sys.stderr.buffer.write(stderr.encode("utf-8"))
</ins><span class="cx">                 except UnicodeDecodeError:
</span><span class="cx">                     sys.stderr.write(stderr)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>