Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r63864:5f367497a86c
Date: 2013-05-05 11:47 -0700
http://bitbucket.org/pypy/pypy/changeset/5f367497a86c/
Log: always cleanup _decompressor/_compressor, aids cleanup when
BZ2File() fails
diff --git a/pypy/module/bz2/app_bz2file.py b/pypy/module/bz2/app_bz2file.py
--- a/pypy/module/bz2/app_bz2file.py
+++ b/pypy/module/bz2/app_bz2file.py
@@ -92,11 +92,8 @@
if self._mode == _MODE_CLOSED:
return
try:
- if self._mode in (_MODE_READ, _MODE_READ_EOF):
- self._decompressor = None
- elif self._mode == _MODE_WRITE:
+ if self._mode == _MODE_WRITE:
self._fp.write(self._compressor.flush())
- self._compressor = None
finally:
try:
if self._closefp:
@@ -105,7 +102,7 @@
self._fp = None
self._closefp = False
self._mode = _MODE_CLOSED
- self._buffer = None
+ self._buffer = self._decompressor = self._compressor = None
@property
def closed(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
