diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
| commit | a977329b6fb0e4c95cabb9043794de69b27a1099 (patch) | |
| tree | b91552a0578639bd10181ab612039c1bed9bec27 /Lib/StringIO.py | |
| parent | d858f70617a9df8456e89a898ad8f97bd57c09f9 (diff) | |
| download | cpython-git-a977329b6fb0e4c95cabb9043794de69b27a1099.tar.gz | |
Merge part of the trunk changes into the p3yk branch. This merges from 43030
(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.
This merge should break no additional tests.
The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)
Diffstat (limited to 'Lib/StringIO.py')
| -rw-r--r-- | Lib/StringIO.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/StringIO.py b/Lib/StringIO.py index 5c463fbc1c..1e5f25408d 100644 --- a/Lib/StringIO.py +++ b/Lib/StringIO.py @@ -72,8 +72,7 @@ class StringIO: method is called repeatedly. This method returns the next input line, or raises StopIteration when EOF is hit. """ - if self.closed: - raise StopIteration + _complain_ifclosed(self.closed) r = self.readline() if not r: raise StopIteration |