Off-by-one in GridOut.readline().

Author: A. Jesse Jiryu Davis

gridfs/grid_file.py

@@ -511,7 +511,7 @@ def readline(self, size=-1):
  for pos in xrange(len(chunk_data)):
  byte = chunk_data[pos]
  if byte == EMPTY or byte == NEWLN:
- size = received + pos
+ size = received + pos + 1
  break
 
  received += len(chunk_data)

test/test_grid_file.py

@@ -396,6 +396,7 @@ def test_readline(self):
 Bye"""))
  f.close()
 
+ # Try read(), then readline().
  g = GridOut(self.db.fs, f._id)
  self.assertEqual(b("H"), g.read(1))
  self.assertEqual(b("ello world,\n"), g.readline())
@@ -406,6 +407,19 @@ def test_readline(self):
  self.assertEqual(b("Bye"), g.readline())
  self.assertEqual(b(""), g.readline())
 
+ # Try readline() first, then read().
+ g = GridOut(self.db.fs, f._id)
+ self.assertEqual(b("He"), g.readline(2))
+ self.assertEqual(b("l"), g.read(1))
+ self.assertEqual(b("lo"), g.readline(2))
+ self.assertEqual(b(" world,\n"), g.readline())
+
+ # Only readline().
+ g = GridOut(self.db.fs, f._id)
+ self.assertEqual(b("H"), g.readline(1))
+ self.assertEqual(b("e"), g.readline(1))
+ self.assertEqual(b("llo world,\n"), g.readline())
+
  def test_iterator(self):
  f = GridIn(self.db.fs)
  f.close()