PYTHON-712 ObjectId.is_valid(None) should be False.

2014-06-18 16:19:58 -04:00 · 2014-06-18 16:19:58 -04:00 · fb207af4cf
commit fb207af4cf
parent 2dc840955a
2 changed files with 4 additions and 0 deletions
--- a/bson/objectid.py
+++ b/bson/objectid.py
@ -140,6 +140,9 @@ class ObjectId(object):

        .. versionadded:: 2.3
        """
+        if not oid:
+            return False
+
        try:
            ObjectId(oid)
            return True
--- a/test/test_objectid.py
+++ b/test/test_objectid.py
@ -181,6 +181,7 @@ class TestObjectId(unittest.TestCase):
        self.assertEqual(oid_1_9, oid_1_10)

    def test_is_valid(self):
+        self.assertFalse(ObjectId.is_valid(None))
        self.assertFalse(ObjectId.is_valid(4))
        self.assertFalse(ObjectId.is_valid(175.0))
        self.assertFalse(ObjectId.is_valid({"test": 4}))