From 464941e5ade37c8dce8d017d4d71e6251d353799 Mon Sep 17 00:00:00 2001 From: Kyle Erf Date: Mon, 6 Jan 2014 15:25:04 -0800 Subject: [PATCH] PYTHON-621: Fixed GridOut.read(0) returning string in Python 3 --- gridfs/grid_file.py | 2 +- test/test_grid_file.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gridfs/grid_file.py b/gridfs/grid_file.py index 32555e628..1d2058e98 100644 --- a/gridfs/grid_file.py +++ b/gridfs/grid_file.py @@ -467,7 +467,7 @@ class GridOut(object): self._ensure_file() if size == 0: - return "" + return EMPTY remainder = int(self.length) - self.__position if size < 0 or size > remainder: diff --git a/test/test_grid_file.py b/test/test_grid_file.py index 19eba101b..2de04d905 100644 --- a/test/test_grid_file.py +++ b/test/test_grid_file.py @@ -73,6 +73,9 @@ class TestGridFile(unittest.TestCase): g = GridOut(self.db.fs, f._id) self.assertEqual(b(""), g.read()) + # test that reading 0 returns proper type + self.assertEqual(b(""), g.read(0)) + def test_md5(self): f = GridIn(self.db.fs) f.write(b("hello world\n"))