diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-06-12 08:19:12 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-06-12 08:19:12 -0700 |
| commit | 3a49e17de7e494eb8e648d5cce62ee56434b0c16 (patch) | |
| tree | 8db68a39bfb23f322024e37896ad7d48ef27fc76 | |
| parent | 44f568d264dc8714c92eef21c81382027ad5f12f (diff) | |
| download | python-apt-3a49e17de7e494eb8e648d5cce62ee56434b0c16.tar.gz | |
Revert change from lp:~ev/python-apt/dont-leak-fds; as discussed on IRC
during the Python3 porting sprint, the cure here is worse than the
disease.
| -rw-r--r-- | apt/progress/base.py | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/apt/progress/base.py b/apt/progress/base.py index 88b1ad21..4943978c 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -146,10 +146,6 @@ class InstallProgress(object): self.status_stream = os.fdopen(self.statusfd, "r") fcntl.fcntl(self.statusfd, fcntl.F_SETFL, os.O_NONBLOCK) - def __del__(self): - self.write_stream.close() - self.status_stream.close() - def start_update(self): """(Abstract) Start update.""" diff --git a/debian/changelog b/debian/changelog index ab2fae38..9cff1ff0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ python-apt (0.8.5~ubuntu1) UNRELEASED; urgency=low - build with COMPAT_0_7, which might still be needed by some code in the Ubuntu archive. We need to scan the archive for this, add liberal Breaks, and analyze the dist-upgrader case before disabling. + * Revert change from lp:~ev/python-apt/dont-leak-fds; as discussed on IRC + during the Python3 porting sprint, the cure here is worse than the + disease. [ Colin Watson ] * aptsources/*.py, setup.py: Make aptsources modules work directly in |