Merge with mvo, with the following changes:

* python/generic.cc is changed instead of python/indexfile.cc
  to add the ArchiveURI property
* tests/test_apt_cache.py is changed to assert the properties
  of the Dependency object instead of assigning them to a
  variable.

The additions to the changelog are:

[ Julian Andres Klode ]
  - Map ArchiveURI property to archive_uri
[ Michael Vogt ]
* apt/cache.py:
  - make cache open silent by default (use apt.progress.base.OpProgress)
* tests/data/aptsources_ports/sources.list:
  - fix ports test-data
* tests/test_apt_cache.py:
  - add simple test for basic cache/dependency iteration

1 files changed, 1 insertions, 1 deletions

diff --git a/apt/cache.py b/apt/cache.py
index 2e6d24e5..cfe6bedc 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -117,7 +117,7 @@ class Cache(object):
             a dictionary
         """
         if progress is None:
-            progress = apt.progress.text.OpProgress()
+            progress = apt.progress.base.OpProgress()
         self._run_callbacks("cache_pre_open")
 
         self._cache = apt_pkg.Cache(progress)