Merge branch 'PYTHON-360'

Author: rozza

bson/objectid.py

@@ -123,6 +123,21 @@ def from_datetime(cls, generation_time):
  oid = struct.pack(">i", int(ts)) + ZERO * 8
  return cls(oid)
 
+ @classmethod
+ def is_valid(cls, oid):
+ """Checks if a `oid` string is valid or not.
+
+ :Parameters:
+ - `oid`: the object id to validate
+
+ .. versionadded:: 2.2.1+
+ """
+ try:
+ ObjectId(oid)
+ return True
+ except (InvalidId, TypeError):
+ return False
+
  def __generate(self):
  """Generate a new value for this ObjectId.
  """

test/test_objectid.py

@@ -179,5 +179,17 @@ def test_pickle_backwards_compatability(self):
  self.assertEqual(oid_1_9, ObjectId("4d9a66561376c00b88000000"))
  self.assertEqual(oid_1_9, oid_1_10)
 
+ def test_is_valid(self):
+ self.assertFalse(ObjectId.is_valid(4))
+ self.assertFalse(ObjectId.is_valid(175.0))
+ self.assertFalse(ObjectId.is_valid({"test": 4}))
+ self.assertFalse(ObjectId.is_valid(["something"]))
+ self.assertFalse(ObjectId.is_valid(""))
+ self.assertFalse(ObjectId.is_valid("12345678901"))
+ self.assertFalse(ObjectId.is_valid("1234567890123"))
+
+ self.assertTrue(ObjectId.is_valid(b("123456789012")))
+ self.assertTrue(ObjectId.is_valid("123456789012123456789012"))
+
 if __name__ == "__main__":
  unittest.main()