Changeset 146576 in webkit

Timestamp:

Mar 22, 2013 1:52:32 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r146504 - [GTK] generate-feature-defines-files is incompatible with Python3
​https://bugs.webkit.org/show_bug.cgi?id=112956

Reviewed by Martin Robinson.

Make the generate-feature-defines-files compatible with Python3 by calling the items()
method on the dictionary objects when iterating through said dictionaries.

• gtk/generate-feature-defines-files:

(write_feature_defines_header):
(write_flattened_feature_defines_file):

Location:

releases/WebKitGTK/webkit-2.0/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/generate-feature-defines-files (modified) (2 diffs)

releases/WebKitGTK/webkit-2.0/Tools/ChangeLog

@@ +1 @@
+2013-03-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] generate-feature-defines-files is incompatible with Python3
+        https://bugs.webkit.org/show_bug.cgi?id=112956
+
+        Reviewed by Martin Robinson.
+
+        Make the generate-feature-defines-files compatible with Python3 by calling the items()
+        method on the dictionary objects when iterating through said dictionaries.
+
+        * gtk/generate-feature-defines-files:
+        (write_feature_defines_header):
+        (write_flattened_feature_defines_file):
+
 2013-03-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.0/Tools/gtk/generate-feature-defines-files

@@ -33 +33 @@
 def write_feature_defines_header(feature_defines):
     contents = ''
-    for (feature, value) in feature_defines.iteritems():
+    for (feature, value) in feature_defines.items():
         contents += '#define {0} {1}\n'.format(feature, value)
     write_file_if_contents_changed("WebKitFeatures.h", contents)
@@ -39 +39 @@
 def write_flattened_feature_defines_file(feature_defines):
     contents = ''
-    for (feature, value) in feature_defines.iteritems():
+    for (feature, value) in feature_defines.items():
         contents += '{0}={1}\n'.format(feature, value)
     write_file_if_contents_changed("WebKitFeatures.txt", contents)