merge in fixes for python 2.5

tests/owners_unittest.py

Index: tests/owners_unittest.py
diff --git a/tests/owners_unittest.py b/tests/owners_unittest.py
index 1ac7a5e20235f41f70f1c8ce5ad5ec65513cc2df..92029bc60f9557e1e8a14a4784e8f92dde59e896 100755
--- a/tests/owners_unittest.py
+++ b/tests/owners_unittest.py
@@ -109,8 +109,9 @@ class OwnersDatabaseTest(unittest.TestCase):
 
     # 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'
@@ -139,7 +140,9 @@ class OwnersDatabaseTest(unittest.TestCase):
 
     # 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'