tsr/planet
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fix html5lib regression

Browse Source 
http://lists.planetplanet.org/archives/devel/2007-August/001644.html
http://groups.google.com/group/html5lib-discuss/browse_frm/thread/f4f00e4a2f26d5c0
This commit is contained in:
Sam Ruby 2007-08-14 07:10:36 -04:00
parent faa2981642
commit 9a0ae97b07
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
planet/vendor/html5lib/inputstream.py vendored
View File

@ -272,35 +272,46 @@ class HTMLInputStream(object):
#If the queue doesn't grow we have reached EOF #If the queue doesn't grow we have reached EOF
if i == len(self.queue) or self.queue[i] is EOF: if i == len(self.queue) or self.queue[i] is EOF:
break break
#XXX- wallpaper over bug in calculation below
#Otherwise change the stream position
if self.queue[i] == '\n':
self.lineLengths.append(self.col)
self.line += 1
self.col = 0
else:
self.col += 1
rv = u"".join(self.queue[:i]) rv = u"".join(self.queue[:i])
self.queue = self.queue[i:]
#Calculate where we now are in the stream #Calculate where we now are in the stream
#One possible optimisation would be to store all read characters and #One possible optimisation would be to store all read characters and
#Calculate this on an as-needed basis (perhaps flushing the read data #Calculate this on an as-needed basis (perhaps flushing the read data
#every time we read a new chunk) rather than once per call here and #every time we read a new chunk) rather than once per call here and
#in .char() #in .char()
lines = rv.split("\n")
if lines: #XXX Temporarily disable this because there is a bug
#Add number of lines passed onto positon
oldCol = self.col
self.line += len(lines)-1
if len(lines) > 1:
self.col = len(lines[-1])
else:
self.col += len(lines[0])
if self.lineLengths and oldCol > 0:
self.lineLengths[-1] += len(lines[0])
lines = lines[1:-1]
else:
lines = lines[:-1]
for line in lines: #lines = rv.split("\n")
self.lineLengths.append(len(line)) #
#if lines:
self.queue = self.queue[i:] # #Add number of lines passed onto positon
# oldCol = self.col
# self.line += len(lines)-1
# if len(lines) > 1:
# self.col = len(lines[-1])
# else:
# self.col += len(lines[0])
#
# if self.lineLengths and oldCol > 0:
# self.lineLengths[-1] += len(lines[0])
# lines = lines[1:-1]
# else:
# lines = lines[:-1]
#
# for line in lines:
# self.lineLengths.append(len(line))
#
return rv return rv