diff options
| author | Robert Collins <rbtcollins@hp.com> | 2015-06-11 09:21:53 +1200 |
|---|---|---|
| committer | Stuart McLaren <stuart.mclaren@hp.com> | 2015-06-11 18:11:39 +0000 |
| commit | 43621dc1ac626f7ce3322cee8b7908a93af20f26 (patch) | |
| tree | efe52d9b57f79f90035462bc11c8767a831697aa /glanceclient/common/utils.py | |
| parent | db6420b44779411d6d1f238f6b887f83f1988986 (diff) | |
| download | python-glanceclient-43621dc1ac626f7ce3322cee8b7908a93af20f26.tar.gz | |
Close iterables at the end of iteration
This fixes a bug where if iteration is interrupted, we're stuck until
the iterable is garbage collected, which can be a very long time (e.g. if
the iterable is held in an exception stack frame).
Co-authored-by: Stuart McLaren <stuart.mclaren@hp.com>
Change-Id: Ibe9990e8c337c117a978b1cd8ec388c4bc6d3b4b
Closes-bug: 1461678
Diffstat (limited to 'glanceclient/common/utils.py')
| -rw-r--r-- | glanceclient/common/utils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/glanceclient/common/utils.py b/glanceclient/common/utils.py index b199bf3..bba0cab 100644 --- a/glanceclient/common/utils.py +++ b/glanceclient/common/utils.py @@ -434,7 +434,11 @@ class IterableWithLength(object): self.length = length def __iter__(self): - return self.iterable + try: + for chunk in self.iterable: + yield chunk + finally: + self.iterable.close() def next(self): return next(self.iterable) |