Title: [91106] trunk/Tools
- Revision
- 91106
- Author
- [email protected]
- Date
- 2011-07-15 13:49:54 -0700 (Fri, 15 Jul 2011)
Log Message
Revert http://trac.webkit.org/changeset/91091, since Python 2.5
does not support enumerate() start argument.
* Scripts/webkitpy/layout_tests/models/test_expectations.py: Reverted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91105 => 91106)
--- trunk/Tools/ChangeLog 2011-07-15 20:49:53 UTC (rev 91105)
+++ trunk/Tools/ChangeLog 2011-07-15 20:49:54 UTC (rev 91106)
@@ -1,5 +1,12 @@
2011-07-15 Dimitri Glazkov <[email protected]>
+ Revert http://trac.webkit.org/changeset/91091, since Python 2.5
+ does not support enumerate() start argument.
+
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py: Reverted.
+
+2011-07-15 Dimitri Glazkov <[email protected]>
+
Clean up test_expectations.py after refactorings.
https://bugs.webkit.org/show_bug.cgi?id=64620
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (91105 => 91106)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2011-07-15 20:49:53 UTC (rev 91105)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2011-07-15 20:49:54 UTC (rev 91106)
@@ -736,7 +736,9 @@
def _report_errors(self):
errors = []
warnings = []
- for lineno, expectation in enumerate(self._expectations, start=1):
+ lineno = 0
+ for expectation in self._expectations:
+ lineno += 1
for error in expectation.errors:
errors.append("Line:%s %s %s" % (lineno, error, expectation.name if expectation.expectations else expectation.comment))
for warning in expectation.warnings:
@@ -787,7 +789,9 @@
ModifiersAndExpectations(modifiers, expectations))
def _add_expectations(self, expectation_list, overrides_allowed):
- for lineno, expectation in enumerate(expectation_list, start=1):
+ lineno = 0
+ for expectation in expectation_list:
+ lineno += 1
expectations = expectation.expectations
if not expectation.expectations:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
