Properly handle non-existing documents in Document.load() by returning None.

cmlenz · cmlenz · commit d0b709995fd7 · 2008-08-06T20:39:25.000Z
--HG--
extra : convert_revision : svn%3A7a298fb0-333a-0410-83e7-658617cd9cf3/trunk%4095
diff --git a/couchdb/schema.py b/couchdb/schema.py
@@ -200,8 +200,17 @@ def rev(self):
     rev = property(rev)
 
     def load(cls, db, id):
-        """Load a specific document from the given database."""
-        return cls.wrap(db.get(id))
+        """Load a specific document from the given database.
+        
+        :param db: the `Database` object to retrieve the document from
+        :param id: the document ID
+        :return: the `Document` instance, or `None` if no document with the
+                 given ID was found
+        """
+        doc = db.get(id)
+        if doc is None:
+            return None
+        return cls.wrap(doc)
     load = classmethod(load)
 
     def store(self, db):
