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, 0 deletions

diff --git a/python/generic.cc b/python/generic.cc
index 1c68a481..e04743ff 100644
--- a/python/generic.cc
+++ b/python/generic.cc
@@ -63,6 +63,7 @@ static PyObject *_PyApt_NewNameForAttribute(const char *attr) {
     if (strcasecmp(attr, "ReadPinFile") == 0) return PyString_FromString("read_pinfile");
     if (strcasecmp(attr, "SetReInstall") == 0) return PyString_FromString("set_reinstall");
     if (strcasecmp(attr, "URI") == 0) return PyString_FromString("uri");
+    if (strcasecmp(attr, "ArchiveURI") == 0) return PyString_FromString("archive_uri");
     if (strcasecmp(attr, "MD5Hash") == 0) return PyString_FromString("md5_hash");
     if (strcasecmp(attr, "SHA1Hash") == 0) return PyString_FromString("sha1_hash");
     if (strcasecmp(attr, "SHA256Hash") == 0) return PyString_FromString("sha256_hash");