Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Don't use calculations on values gotten from tell(). Also use a 

slightly different way to test for the existence of unread.
This commit is contained in:
Guido van Rossum 1998-07-21 14:24:04 +00:00
parent 897b9f0b0d
commit 052969a602
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/rfc822.py
View File

@ -125,7 +125,14 @@ class Message:
self.status = '' self.status = ''
headerseen = "" headerseen = ""
firstline = 1 firstline = 1
startofline = unread = tell = None
if hasattr(self.fp, 'unread'):
unread = self.fp.unread
elif self.seekable:
tell = self.fp.tell
while 1: while 1:
if tell:
startofline = tell()
line = self.fp.readline() line = self.fp.readline()
if not line: if not line:
self.status = 'EOF in headers' self.status = 'EOF in headers'
@ -160,10 +167,10 @@ class Message:
else: else:
self.status = 'Non-header line where header expected' self.status = 'Non-header line where header expected'
# Try to undo the read. # Try to undo the read.
if hasattr(self.fp, 'unread'): if unread:
self.fp.unread(line) unread(line)
elif self.seekable: elif tell:
self.fp.seek(-len(line), 1) self.fp.seek(startofline)
else: else:
self.status = self.status + '; bad seek' self.status = self.status + '; bad seek'
break break