* setup.py: Remove apt.gtk, add apt.progress

3 files changed, 6 insertions, 3 deletions

diff --git a/apt/cache.py b/apt/cache.py
index 9f00b8a5..11e44c9e 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -52,9 +52,11 @@ class Cache(object):
             apt_pkg.Config.Set("Dir::Cache::pkgcache", "")
         if rootdir:
             if os.path.exists(rootdir+"/etc/apt/apt.conf"):
-                apt_pkg.ReadConfigFile(apt_pkg.Config, rootdir+"/etc/apt/apt.conf")
+                apt_pkg.ReadConfigFile(apt_pkg.Config,
+                                       rootdir + "/etc/apt/apt.conf")
             if os.path.isdir(rootdir+"/etc/apt/apt.conf.d"):
-                apt_pkg.ReadConfigDir(apt_pkg.Config, rootdir+"/etc/apt/apt.conf.d")
+                apt_pkg.ReadConfigDir(apt_pkg.Config,
+                                      rootdir + "/etc/apt/apt.conf.d")
             apt_pkg.Config.Set("Dir", rootdir)
             apt_pkg.Config.Set("Dir::State::status",
                                rootdir + "/var/lib/dpkg/status")
diff --git a/doc/source/apt_pkg/index.rst b/doc/source/apt_pkg/index.rst
index e944eb15..6e7b772e 100644
--- a/doc/source/apt_pkg/index.rst
+++ b/doc/source/apt_pkg/index.rst
@@ -201,6 +201,7 @@ Other functions
 .. autofunction:: PkgSystemUnLock
 .. autofunction:: QuoteString
 .. autofunction:: ReadConfigFile
+.. autofunction:: ReadConfigDir()
 .. autofunction:: ReadConfigFileISC
 .. autofunction:: RewriteSection
 
diff --git a/setup.py b/setup.py
index 6a22734d..fc046381 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ setup(name="python-apt",
       author="APT Development Team",
       author_email="deity@lists.debian.org",
       ext_modules=[apt_pkg, apt_inst],
-      packages=['apt', 'apt.gtk', 'aptsources'],
+      packages=['apt', 'apt.progress', 'aptsources'],
       data_files = [('share/python-apt/templates',
                     glob.glob('build/data/templates/*.info')),
                     ('share/python-apt/templates',