diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-18 17:55:17 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-18 17:55:17 -0700 |
| commit | 6e3936dad29d19154e24c233688e39179ea7e866 (patch) | |
| tree | 6055f6cadd8932b77555dbc0bffb2276f00d5992 /paramiko/file.py | |
| parent | 0e4a80306067836a747275dd4f81bd5dc8ee07d8 (diff) | |
| parent | a2006766fb6afba93d57004ce1e5ed0ed71c4f16 (diff) | |
| download | paramiko-6e3936dad29d19154e24c233688e39179ea7e866.tar.gz | |
Merge branch '1.14' into 1.15
Diffstat (limited to 'paramiko/file.py')
| -rw-r--r-- | paramiko/file.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/paramiko/file.py b/paramiko/file.py index 09998829..311e1982 100644 --- a/paramiko/file.py +++ b/paramiko/file.py @@ -106,14 +106,13 @@ class BufferedFile (ClosingContextManager): else: def __next__(self): """ - Returns the next line from the input, or raises L{StopIteration} when + Returns the next line from the input, or raises `.StopIteration` when EOF is hit. Unlike python file objects, it's okay to mix calls to - C{next} and L{readline}. + `.next` and `.readline`. - @raise StopIteration: when the end of the file is reached. + :raises StopIteration: when the end of the file is reached. - @return: a line read from the file. - @rtype: str + :returns: a line (`str`) read from the file. """ line = self.readline() if not line: |