Fixed line-count bug introduced in r1154

philiptaylor · philiptaylor · commit c7e3ffc5f564 · 2008-06-03T12:26:06.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401162
diff --git a/src/html5lib/inputstream.py b/src/html5lib/inputstream.py
@@ -250,7 +250,9 @@ def char(self):
             EOF when EOF is reached.
         """
         if self.ungetBuffer:
-            return self.ungetBuffer.pop()
+            char = self.ungetBuffer.pop()
+            self.readChars.append(char)
+            return char
 
         if self.chunkOffset >= len(self.chunk):
             if not self.readChunk():
diff --git a/tests/test_stream.py b/tests/test_stream.py
@@ -60,7 +60,10 @@ def test_position(self):
         self.assertEquals(stream.position(), (1, 0))
         self.assertEquals(stream.charsUntil('c'),u"a\nbb\n")
         self.assertEquals(stream.position(), (3, 0))
-	self.assertEquals(stream.charsUntil('e'),u"ccc\nddd")
+        stream.unget("\n")
+        self.assertEquals(stream.char(), u"\n")
+        self.assertEquals(stream.position(), (3, 0))
+        self.assertEquals(stream.charsUntil('e'),u"ccc\nddd")
         self.assertEquals(stream.position(), (4, 3))
 
 def buildTestSuite():
