diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-05-02 11:33:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-03 17:37:55 +0200 |
| commit | a2e31061d4a24fceb4d32f4df301150ee1cc8af1 (patch) | |
| tree | 825924e6d7f55a199a6f1bb2f02ceb07451ee3c0 | |
| parent | 498d0427290f5a9957bfab1bb521eb10b9b9693a (diff) | |
| download | qtwebkit-a2e31061d4a24fceb4d32f4df301150ee1cc8af1.tar.gz | |
Build failures when building with python 3.3
https://bugs.webkit.org/show_bug.cgi?id=106194
Reviewed by Dirk Pranke.
Python 3.3 introduced changes to dictionaries which can result in changed
iteration order. More about these changes:
http://docs.python.org/3.3/whatsnew/3.3.html#pep-412-key-sharing-dictionary
http://www.python.org/dev/peps/pep-0412/#cons
This causes the Source/WebCore/inspector/generate-inspector-protocol-version
script to fail the self-testing when using Python 3.3. These changes work
around this problem by not checking for expected errors in order but rather
for their presence in the error output sequence. The number of actual errors
is also checked to be equal to the number of expected errors.
No new tests - no new functionality.
* inspector/generate-inspector-protocol-version:
(self_test):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139081 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I13c3e499bcb662466701879d015f5a378a28cd0b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Source/WebCore/ChangeLog | 23 | ||||
| -rwxr-xr-x | Source/WebCore/inspector/generate-inspector-protocol-version | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 7b841c56b..156d9c468 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,26 @@ +2013-01-08 Zan Dobersek <zandobersek@gmail.com> + + [GTK] Build failures when building with python 3.3 + https://bugs.webkit.org/show_bug.cgi?id=106194 + + Reviewed by Dirk Pranke. + + Python 3.3 introduced changes to dictionaries which can result in changed + iteration order. More about these changes: + http://docs.python.org/3.3/whatsnew/3.3.html#pep-412-key-sharing-dictionary + http://www.python.org/dev/peps/pep-0412/#cons + + This causes the Source/WebCore/inspector/generate-inspector-protocol-version + script to fail the self-testing when using Python 3.3. These changes work + around this problem by not checking for expected errors in order but rather + for their presence in the error output sequence. The number of actual errors + is also checked to be equal to the number of expected errors. + + No new tests - no new functionality. + + * inspector/generate-inspector-protocol-version: + (self_test): + 2013-03-12 Floris Bos <bos@je-eigen-domein.nl> [Qt] WebKit fails to compile if EGL headers are not in default INCLUDEPATH diff --git a/Source/WebCore/inspector/generate-inspector-protocol-version b/Source/WebCore/inspector/generate-inspector-protocol-version index bd606b46e..38a0f98c3 100755 --- a/Source/WebCore/inspector/generate-inspector-protocol-version +++ b/Source/WebCore/inspector/generate-inspector-protocol-version @@ -303,9 +303,9 @@ def self_test(): "Network.requestWillBeSent: required parameter is missing: postData", "Network.requestWillBeSent: required parameter is missing: documentURL" ] for i in range(len(errors)): - if errors[i] != golden_errors[i]: + if errors[i] not in golden_errors: return False - return True + return len(errors) is len(golden_errors) def main(): if not self_test(): |