Merge debian-experimental.

1 files changed, 8 insertions, 9 deletions

diff --git a/apt/__init__.py b/apt/__init__.py
index 4b3e6bf2..677a625b 100644
--- a/apt/__init__.py
+++ b/apt/__init__.py
@@ -17,22 +17,21 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 # import the core of apt_pkg
+"""High-Level Interface for working with apt."""
 import apt_pkg
-import sys
-import os
 
 # import some fancy classes
 from apt.package import Package
 from apt.cache import Cache, ProblemResolver
-from apt.progress import (
-    OpProgress, FetchProgress, InstallProgress, CdromProgress)
 from apt.cdrom import Cdrom
-from apt_pkg import SizeToStr, TimeToStr, VersionCompare
+
+if apt_pkg._COMPAT_0_7:
+    from apt.progress.old import (OpProgress, FetchProgress, InstallProgress,
+                                  CdromProgress)
+    from apt_pkg import (size_to_str as SizeToStr, time_to_str as TimeToStr,
+                         version_compare as VersionCompare)
 
 # init the package system
 apt_pkg.init()
 
-
-#import warnings
-#warnings.warn("apt API not stable yet", FutureWarning)
-#del warnings
+__all__ = ['Cache', 'Cdrom', 'Package']