merge in fixes for python 2.5

tests/owners_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for owners.py."""
 
 import unittest
 
 import owners
@@ skipping 91 matching lines @@
 
   def test_not_covered_by__set_noparent_works(self):
     self.assert_not_covered_by(['content/content.gyp'], [ben],
                              ['content/content.gyp'])
 
   def test_not_covered_by__valid_inputs(self):
     db = self.db()
 
     # Check that we're passed in a sequence that isn't a string.
     self.assertRaises(AssertionError, db.files_not_covered_by, 'foo', [])
-    self.assertRaises(AssertionError, db.files_not_covered_by,
-                      (f for f in ['x', 'y']), [])
+    if hasattr(owners.collections, 'Iterable'):
+      self.assertRaises(AssertionError, db.files_not_covered_by,
+                        (f for f in ['x', 'y']), [])
 
     # Check that the files are under the root.
     db.root = '/checkout'
     self.assertRaises(AssertionError, db.files_not_covered_by, ['/OWNERS'],
                       [])
     db.root = '/'
 
     # Check invalid email address.
     self.assertRaises(AssertionError, db.files_not_covered_by, ['OWNERS'],
                       ['foo'])
 
 
   def assert_reviewers_for(self, files, expected_reviewers):
     db = self.db()
     self.assertEquals(db.reviewers_for(set(files)), set(expected_reviewers))
 
   def test_reviewers_for__basic_functionality(self):
     self.assert_reviewers_for(['chrome/gpu/gpu_channel.h'],
                              [ken, ben, brett, owners.EVERYONE])
 
   def test_reviewers_for__set_noparent_works(self):
     self.assert_reviewers_for(['content/content.gyp'], [john, darin])
 
   def test_reviewers_for__valid_inputs(self):
     db = self.db()
 
     # Check that we're passed in a sequence that isn't a string.
     self.assertRaises(AssertionError, db.reviewers_for, 'foo')
-    self.assertRaises(AssertionError, db.reviewers_for, (f for f in ['x', 'y']))
+    if hasattr(owners.collections, 'Iterable'):
+      self.assertRaises(AssertionError, db.reviewers_for,
+                        (f for f in ['x', 'y']))
 
     # Check that the files are under the root.
     db.root = '/checkout'
     self.assertRaises(AssertionError, db.reviewers_for, ['/OWNERS'])
 
   def test_reviewers_for__wildcard_dir(self):
     self.assert_reviewers_for(['DEPS'], [owners.EVERYONE])
 
   def assert_syntax_error(self, owners_file_contents):
     db = self.db()
@@ skipping 10 matching lines @@
 
   def test_syntax_error__unknown_set(self):
     self.assert_syntax_error('set myfatherisbillgates\n')
 
   def test_syntax_error__bad_email(self):
     self.assert_syntax_error('ben\n')
 
 
 if __name__ == '__main__':
   unittest.main()