merge in fixes for python 2.5

R=maruel@chromium.org

Review URL: http://codereview.chromium.org/6740012

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@79942 0039d316-1c4b-4281-b951-d872f2087c98

owners.py

@@ -17,9 +17,10 @@ BASIC_EMAIL_REGEXP = r'^[\w\-\+\%\.]+\@[\w\-\+\%\.]+$'
 
 
 def _assert_is_collection(obj):
+  assert not isinstance(obj, basestring)
+  if hasattr(collections, 'Iterable') and hasattr(collections, 'Sized'):
     assert (isinstance(obj, collections.Iterable) and
-          isinstance(obj, collections.Sized) and
-          not isinstance(obj, basestring))
+            isinstance(obj, collections.Sized))
 
 
 class SyntaxErrorInOwnersFile(Exception):

tests/owners_unittest.py

@@ -109,6 +109,7 @@ 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', [])
+    if hasattr(owners.collections, 'Iterable'):
       self.assertRaises(AssertionError, db.files_not_covered_by,
                         (f for f in ['x', 'y']), [])
 
@@ -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'