Changeset 139048 in webkit

Timestamp:

Jan 8, 2013 2:10:24 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Make Tools/gtk/generate-gtkdoc compatible with Python 3
​https://bugs.webkit.org/show_bug.cgi?id=106195

Reviewed by Philippe Normand.

Perform changes in the generate-gtkdoc script and common and gtkdoc modules
to make the Python code compatible with Python 3. This includes modifying
print statements, exception handling, dictionary iteration and
byte-sequence-to-string conversion.

• gtk/common.py:

(get_build_path):
(pkg_config_file_variable):
(gtk_version_of_pkg_config_file):

• gtk/generate-gtkdoc:

(print_missing_api):

• gtk/gtkdoc.py:

(GTKDoc.init):
(GTKDoc._run_command):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/common.py (modified) (3 diffs)
• gtk/generate-gtkdoc (modified) (3 diffs)
• gtk/gtkdoc.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-08  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] Make Tools/gtk/generate-gtkdoc compatible with Python 3
+        https://bugs.webkit.org/show_bug.cgi?id=106195
+
+        Reviewed by Philippe Normand.
+
+        Perform changes in the generate-gtkdoc script and common and gtkdoc modules
+        to make the Python code compatible with Python 3. This includes modifying
+        print statements, exception handling, dictionary iteration and
+        byte-sequence-to-string conversion.
+
+        * gtk/common.py:
+        (get_build_path):
+        (pkg_config_file_variable):
+        (gtk_version_of_pkg_config_file):
+        * gtk/generate-gtkdoc:
+        (print_missing_api):
+        * gtk/gtkdoc.py:
+        (GTKDoc.__init__):
+        (GTKDoc._run_command):
+
 2013-01-02  Steve Block  <steveblock@chromium.org>
 

trunk/Tools/gtk/common.py

@@ -76 +76 @@
         return build_dir
 
-    print 'Could not determine build directory.'
+    print('Could not determine build directory.')
     sys.exit(1)
 
@@ -87 +87 @@
     process = subprocess.Popen(['pkg-config', '--variable=%s' % variable, package],
                                stdout=subprocess.PIPE)
-    stdout = process.communicate()[0]
+    stdout = process.communicate()[0].decode("utf-8")
     if process.returncode:
         return None
@@ -100 +100 @@
     process = subprocess.Popen(['pkg-config', pkg_config_path, '--print-requires'],
                                stdout=subprocess.PIPE)
-    stdout = process.communicate()[0]
+    stdout = process.communicate()[0].decode("utf-8")
 
     if 'gtk+-3.0' in stdout:

trunk/Tools/gtk/generate-gtkdoc

@@ -144 +144 @@
     if not missing_api:
         return
-    print "\nThe following API are missing documentation:"
+    print("\nThe following API are missing documentation:")
     for api in missing_api:
-        print "\t%s" % api
+        print("\t%s" % api)
 
 def generate_doc(generator):
@@ -179 +179 @@
     generator = gtkdoc.PkgConfigGTKDoc(pkg_config_path, options)
     if '--rebase' not in sys.argv:
-        print "Generating WebKit1 documentation..."
+        print("Generating WebKit1 documentation...")
         saw_webkit1_warnings = generate_doc(generator)
     else:
-        print "Rebasing WebKit1 documentation..."
+        print("Rebasing WebKit1 documentation...")
         try:
             generator.rebase_installed_docs()
-        except Exception,e:
-            print "Rebase did not happen, likely no documentation is present."
+        except Exception:
+            print("Rebase did not happen, likely no documentation is present.")
 
 # WebKit2 might not be enabled, so check for the pkg-config file before building documentation.
@@ -193 +193 @@
     generator = gtkdoc.PkgConfigGTKDoc(pkg_config_path, get_webkit2_options())
     if '--rebase' not in sys.argv:
-        print "\nGenerating WebKit2 documentation..."
+        print("\nGenerating WebKit2 documentation...")
         saw_webkit2_warnings = generate_doc(generator)
     else:
-        print "\nRebasing WebKit2 documentation..."
+        print("\nRebasing WebKit2 documentation...")
         try:
             generator.rebase_installed_docs()
-        except Exception,e:
-            print "Rebase did not happen, likely no documentation is present."
+        except Exception:
+            print("Rebase did not happen, likely no documentation is present.")
 
 sys.exit(saw_webkit1_warnings or saw_webkit2_warnings)

trunk/Tools/gtk/gtkdoc.py

@@ -108 +108 @@
         self.logger = logging.getLogger('gtkdoc')
 
-        for key, value in args.iteritems():
+        for key, value in iter(args.items()):
             setattr(self, key, value)
 
@@ -186 +186 @@
                                    stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE)
-        stdout, stderr = process.communicate()
+        stdout, stderr = [b.decode("utf-8") for b in process.communicate()]
 
         if print_output: