Title: [91818] trunk/Tools
Revision
91818
Author
[email protected]
Date
2011-07-26 19:59:50 -0700 (Tue, 26 Jul 2011)

Log Message

Switch to an older idiom that works on Python 2.5.

* Scripts/webkitpy/layout_tests/models/test_configuration.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (91817 => 91818)


--- trunk/Tools/ChangeLog	2011-07-27 02:56:25 UTC (rev 91817)
+++ trunk/Tools/ChangeLog	2011-07-27 02:59:50 UTC (rev 91818)
@@ -1,3 +1,9 @@
+2011-07-26  Adam Barth  <[email protected]>
+
+        Switch to an older idiom that works on Python 2.5.
+
+        * Scripts/webkitpy/layout_tests/models/test_configuration.py:
+
 2011-07-26  Gyuyoung Kim  <[email protected]>
 
         Add an exception to coding style check for EFL port.

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py (91817 => 91818)


--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py	2011-07-27 02:56:25 UTC (rev 91817)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py	2011-07-27 02:59:50 UTC (rev 91818)
@@ -149,7 +149,7 @@
                 category = self._specifier_to_category[expanded_specifier]
                 matching_sets.setdefault(category, set()).update(configurations)
 
-        return set.intersection(*matching_sets.values())
+        return reduce(set.intersection, matching_sets.values())
 
     def to_specifiers_list(self, test_configuration_set):
         """Convert a set of TestConfiguration instances into one or more list of specifiers."""
@@ -188,7 +188,7 @@
                 yield tuple(pool[i] for i in indices)
 
         def intersect_combination(combination):
-            return set.intersection(*[set(specifiers) for specifiers in combination])
+            return reduce(set.intersection, [set(specifiers) for specifiers in combination])
 
         def symmetric_difference(iterable):
             return reduce(lambda x, y: x ^ y, iterable)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to