dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix next

This commit is contained in:
Scott Maxwell 2013-10-30 17:15:40 -07:00
parent 7cdbbf4bdc
commit e4e1dc2002
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
paramiko/file.py
View File

@ -92,21 +92,38 @@ class BufferedFile (object):
self._wbuffer = StringIO() self._wbuffer = StringIO()
return return
def next(self): if PY3:
""" def __next__(self):
Returns the next line from the input, or raises L{StopIteration} when """
EOF is hit. Unlike python file objects, it's okay to mix calls to Returns the next line from the input, or raises L{StopIteration} when
C{next} and L{readline}. EOF is hit. Unlike python file objects, it's okay to mix calls to
C{next} and L{readline}.
@raise StopIteration: when the end of the file is reached. @raise StopIteration: when the end of the file is reached.
@return: a line read from the file. @return: a line read from the file.
@rtype: str @rtype: str
""" """
line = self.readline() line = self.readline()
if not line: if not line:
raise StopIteration raise StopIteration
return line return line
else:
def next(self):
"""
Returns the next line from the input, or raises L{StopIteration} when
EOF is hit. Unlike python file objects, it's okay to mix calls to
C{next} and L{readline}.
@raise StopIteration: when the end of the file is reached.
@return: a line read from the file.
@rtype: str
"""
line = self.readline()
if not line:
raise StopIteration
return line
def read(self, size=None): def read(self, size=None):
""" """