* merge from debian bzr, remaining changes:

  - different mirror list
* data/templates/gNewSense.info.in,
  data/templates/gNewSense.mirrors:
  - add gNewSense template and mirrors, thanks to Karl Goetz
* apt/cache.py:
  - Make Cache.get_changes() much (~35x) faster (Closes: #578074).
  - Make Cache.req_reinstall_pkgs much faster as well.
  - Make Cache.get_providing_packages() about 1000 times faster.
  - Use has_versions and has_provides from apt_pkg.Package where possible.
* apt/package.py:
  - Decode using utf-8 in installed_files (LP: #407953).
  - Fix fetch_source() to work when source name = binary name (LP: #552400).
  - Merge a patch from Sebastian Heinlein to make get_changelog() only
    check sources where source version >= binary version (Closes: #581831).
  - Add Version.source_version and enhance Sebastian's patch to make use
    of it, in order to find the best changelog for the package.
* python:
  - Return bool instead of int to Python where possible, looks better.
  - Document every class, function, property.
* python/cache.cc:
  - Check that 2nd argument to Cache.update() really is a SourceList object.
  - Fix PackageFile.not_automatic to use NotAutomatic instead of NotSource.
  - Add Package.has_versions to see which packages have at least one version,
    and Package.has_provides for provides.
  - Add rich compare methods to the Version object.
* python/generic.cc:
  - Fix a memory leak when using old attribute names.
  - Map ArchiveURI property to archive_uri
* python/progress.cc:
  - Do not pass arguments to InstallProgress.wait_child().
* doc:
  - Update the long documentation.
* debian/control:
  - Change priority to standard, keep -doc and -dev on optional.
* utils/migrate-0.8.py:
  - Open files in universal newline support and pass filename to ast.parse.
  - Add has_key to the list of deprecated functions.
  - Don't abort if parsing failed.
  - do not require files to end in .py if they are passed on the command
    line or if they contain python somewhere in the shebang line.
* 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, 5 insertions, 5 deletions

diff --git a/python/tarfile.cc b/python/tarfile.cc
index 6363af0f..215d3a8c 100644
--- a/python/tarfile.cc
+++ b/python/tarfile.cc
@@ -235,7 +235,7 @@ static PyMethodDef tarmember_methods[] = {
     {"ischr",tarmember_ischr,METH_NOARGS,
      "Determine whether the member is a character device."},
     {"isdev",tarmember_isdev,METH_NOARGS,
-     "Determine whether the member is a device (block,character or FIFO)."},
+     "Determine whether the member is a device (block, character or FIFO)."},
     {"isdir",tarmember_isdir,METH_NOARGS,
      "Determine whether the member is a directory."},
     {"isfifo",tarmember_isfifo,METH_NOARGS,
@@ -252,7 +252,7 @@ static PyMethodDef tarmember_methods[] = {
 };
 
 static PyGetSetDef tarmember_getset[] = {
-    {"gid",tarmember_get_gid,0,"The owner's group id"},
+    {"gid",tarmember_get_gid,0,"The owner's group ID."},
     {"linkname",tarmember_get_linkname,0,"The target of the link."},
     {"major",tarmember_get_major,0,"The major ID of the device."},
     {"minor",tarmember_get_minor,0,"The minor ID of the device."},
@@ -260,7 +260,7 @@ static PyGetSetDef tarmember_getset[] = {
     {"mtime",tarmember_get_mtime,0,"Last time of modification."},
     {"name",tarmember_get_name,0,"The name of the file."},
     {"size",tarmember_get_size,0,"The size of the file."},
-    {"uid",tarmember_get_uid,0,"The owner's user id."},
+    {"uid",tarmember_get_uid,0,"The owner's user ID."},
     {NULL}
 };
 
@@ -375,11 +375,11 @@ static PyObject *tarfile_extractall(PyObject *self, PyObject *args)
 
 static const char *tarfile_go_doc =
     "go(callback: callable[, member: str]) -> True\n\n"
-    "Go through the archive and call the callable callback for each\n"
+    "Go through the archive and call the callable 'callback' for each\n"
     "member with 2 arguments. The first argument is the TarMember and\n"
     "the second one is the data, as bytes.\n\n"
     "The optional parameter 'member' can be used to specify the member for\n"
-    "which call the callback. If not specified, it will be called for all\n"
+    "which to call the callback. If not specified, it will be called for all\n"
     "members. If specified and not found, LookupError will be raised.";
 static PyObject *tarfile_go(PyObject *self, PyObject *args)
 {