apt/progress: Fix apt.progress with COMPAT_0_7

2 files changed, 6 insertions, 13 deletions

diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py
index 67880903..c75c368b 100644
--- a/apt/progress/__init__.py
+++ b/apt/progress/__init__.py
@@ -17,13 +17,8 @@
 """Progress reporting."""
 import apt_pkg
 
-#from apt.progress.text import AcquireProgress as TextAcquireProgress
-#from apt.progress.text import OpProgress as TextOpProgress
-
-__all__ = [] #'TextAcquireProgress', 'TextOpProgress']
-
 if apt_pkg._COMPAT_0_7:
-    import apt.progress.old
-    from apt.progress.old import *
-
-    __all__ += apt.progress.old.__all__
+    from apt.progress.old import (CdromProgress, DpkgInstallProgress,
+                                  DumbInstallProgress, FetchProgress,
+                                  InstallProgress, OpProgress,
+                                  OpTextProgress, TextFetchProgress)
diff --git a/apt/progress/old.py b/apt/progress/old.py
index 3c5d4588..d4ff5815 100644
--- a/apt/progress/old.py
+++ b/apt/progress/old.py
@@ -18,7 +18,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
-"""progress reporting classes.
+"""Deprecated progress reporting classes.
 
 This module provides classes for progress reporting. They can be used with
 e.g., for reporting progress on the cache opening process, the cache update
@@ -36,9 +36,7 @@ import apt_pkg
 from apt.deprecation import AttributeDeprecatedBy, function_deprecated_by
 
 
-__all__ = ('CdromProgress', 'DpkgInstallProgress', 'DumbInstallProgress',
-          'FetchProgress', 'InstallProgress', 'OpProgress', 'OpTextProgress',
-          'TextFetchProgress')
+__all__ = []
 
 
 class OpProgress(object):