Title: [146576] releases/WebKitGTK/webkit-2.0/Tools
- Revision
- 146576
- Author
- [email protected]
- Date
- 2013-03-22 01:52:32 -0700 (Fri, 22 Mar 2013)
Log 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Tools/ChangeLog (146575 => 146576)
--- releases/WebKitGTK/webkit-2.0/Tools/ChangeLog 2013-03-22 08:38:27 UTC (rev 146575)
+++ releases/WebKitGTK/webkit-2.0/Tools/ChangeLog 2013-03-22 08:52:32 UTC (rev 146576)
@@ -1,3 +1,17 @@
+2013-03-21 Zan Dobersek <[email protected]>
+
+ [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 <[email protected]>
[GTK] Add webkit_uri_request_get_http_headers to WebKit2 GTK+ API
Modified: releases/WebKitGTK/webkit-2.0/Tools/gtk/generate-feature-defines-files (146575 => 146576)
--- releases/WebKitGTK/webkit-2.0/Tools/gtk/generate-feature-defines-files 2013-03-22 08:38:27 UTC (rev 146575)
+++ releases/WebKitGTK/webkit-2.0/Tools/gtk/generate-feature-defines-files 2013-03-22 08:52:32 UTC (rev 146576)
@@ -32,13 +32,13 @@
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)
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
