fix for gridfs with non-ObjectId _ids

Author: Mike Dirolf

gridfs/grid_file.py

@@ -122,7 +122,7 @@ class directly.
     def __erase(self):
         """Erase all of the data stored in this GridFile.
         """
-        grid_file = self.__collection.files.find_one(self.__id)
+        grid_file = self.__collection.files.find_one({"_id": self.__id})
         grid_file["next"] = None
         grid_file["length"] = 0
         self.__collection.files.save(grid_file)
@@ -139,9 +139,9 @@ def mode(self):
 
     def __create_property(field_name, read_only=False):
         def getter(self):
-            return self.__collection.files.find_one(self.__id).get(field_name, None)
+            return self.__collection.files.find_one({"_id": self.__id}).get(field_name, None)
         def setter(self, value):
-            grid_file = self.__collection.files.find_one(self.__id)
+            grid_file = self.__collection.files.find_one({"_id": self.__id})
             grid_file[field_name] = value
             self.__collection.files.save(grid_file)
         if not read_only:
@@ -166,7 +166,7 @@ def rename(self, filename):
         :Parameters:
           - `filename`: the new name for this GridFile
         """
-        grid_file = self.__collection.files.find_one(self.__id)
+        grid_file = self.__collection.files.find_one({"_id": self.__id})
         grid_file["filename"] = filename
         self.__collection.files.save(grid_file)
 
@@ -211,7 +211,7 @@ def flush(self):
         md5 = self.__collection.database()._command(SON([("filemd5", self.__id),
                                                          ("root", self.__collection.name())]))["md5"]
 
-        grid_file = self.__collection.files.find_one(self.__id)
+        grid_file = self.__collection.files.find_one({"_id": self.__id})
         grid_file["md5"] = md5
         grid_file["length"] = self.__position + len(self.__buffer)
         self.__collection.files.save(grid_file)

test/test_grid_file.py

@@ -348,5 +348,10 @@ def test_multiple_reads(self):
         self.assertEqual(file.read(2), "")
         file.close()
 
+    def test_spec_with_id(self):
+        # This was raising a TypeError at one point - make sure it doesn't
+        file = GridFile({"_id": "foobar", "filename": "foobar"}, self.db, "w")
+        file.close()
+
 if __name__ == "__main__":
     unittest.main()