Validate cache_for (and deprecated ttl) PYTHON-518

Author: behackett

pymongo/collection.py

@@ -804,6 +804,10 @@ def create_index(self, key_or_list, cache_for=300, **kwargs):
  warnings.warn("ttl is deprecated. Please use cache_for instead.",
  DeprecationWarning, stacklevel=2)
 
+ # The types supported by datetime.timedelta. 2to3 removes long.
+ if not isinstance(cache_for, (int, long, float)):
+ raise TypeError("cache_for must be an integer or float.")
+
  keys = helpers._index_list(key_or_list)
  index_doc = helpers._index_document(keys)
 

test/test_collection.py

@@ -103,6 +103,10 @@ def test_create_index(self):
 
  self.assertRaises(TypeError, db.test.create_index, 5)
  self.assertRaises(TypeError, db.test.create_index, {"hello": 1})
+ self.assertRaises(TypeError,
+ db.test.ensure_index, {"hello": 1}, cache_for='foo')
+ self.assertRaises(TypeError,
+ db.test.ensure_index, {"hello": 1}, ttl='foo')
  self.assertRaises(ValueError, db.test.create_index, [])
 
  db.test.drop_indexes()
@@ -148,6 +152,10 @@ def test_ensure_index(self):
  db = self.db
 
  self.assertRaises(TypeError, db.test.ensure_index, {"hello": 1})
+ self.assertRaises(TypeError,
+ db.test.ensure_index, {"hello": 1}, cache_for='foo')
+ self.assertRaises(TypeError,
+ db.test.ensure_index, {"hello": 1}, ttl='foo')
 
  db.test.drop_indexes()
  self.assertEqual("hello_1", db.test.create_index("hello"))