[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 06a9fc74982d0339fb14e07ef86b880aacbb54be
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 02:10:37 2010 +0000

    2010-11-04  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Tony Chang.
    
            run_webkit_tests_unittest fails under Python 2.5
            https://bugs.webkit.org/show_bug.cgi?id=49043
    
            Switch from itertools.chain.from_iterable (which was added in 2.6)
            to using itertools.chain directly.
    
            * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71380 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ab3303d..be7eb4f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-04  Mihai Parparita  <mihaip at chromium.org>
 
+        Reviewed by Tony Chang.
+
+        run_webkit_tests_unittest fails under Python 2.5
+        https://bugs.webkit.org/show_bug.cgi?id=49043
+        
+        Switch from itertools.chain.from_iterable (which was added in 2.6)
+        to using itertools.chain directly.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
+2010-11-04  Mihai Parparita  <mihaip at chromium.org>
+
         Unreviewed fix to webkit-patch rebaseline-server so that it runs under
         Python 2.5 (it needs an import to use the with statement).
 
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index 8fb3221..f21e7a5 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -154,7 +154,7 @@ def get_tests_run(extra_args=None, tests_included=False, flatten_batches=False):
     logging_run(extra_args=args, port_obj=recording_port, tests_included=True)
 
     if flatten_batches:
-        return list(itertools.chain.from_iterable(test_batches))
+        return list(itertools.chain(*test_batches))
 
     return test_batches
 

-- 
WebKit Debian packaging