Updated to the 0.7.9x series (FFe LP: #531518)

[ Julian Andres Klode ]
* python/generic.cc:
  - Fix a memory leak when using old attribute names.
* debian/control:
  - Change priority to standard, keep -doc and -dev on optional.
[ 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
* debian/control
  - build against XS-Python-Versions: 2.6, 3.1
* tests/test_apt_cache.py:
  - add simple test for basic cache/dependency iteration
* apt/__init__.py:
  - only show deprecation warnings if PYTHON_APT_DEPRECATION_WARNINGS
    is set in the environment. While we do want to have the new API its
    not feasible to port all apps in the lucid timeframe. Once lucid
    is released we turn the warnings on by default again

* Revert 0.7.93.3 and just set APT::Architecture to i386 for
  test_aptsources; fixes FTBFS on powerpc.
* Pass --exclude=migrate-0.8.py to dh_pycentral; in order to not depend
  on python2.6; but recommend python2.6.
* Use dh_link instead of ln for python-apt-doc (Closes: #573523).
* Pass --link-doc=python-apt to dh_installdocs.
* Install examples to python-apt-doc instead of python-apt.
* tests/test_all.py: Write information header to stderr, not stdout.
* Build documentation only when needed (when building python-apt-doc).
* Move documentation into python-apt-doc (Closes: #572617)
* Build documentation only once on the default Python version.
* python/acquire-item.cc:
  - Add AcquireItem.partialsize member.
* python/apt_pkgmodule.cc:
  - Treat '>>' and '>', '<<' and '<' as identical in check_dep (LP: #535667).
* python/generic.cc:
  - Map UntranslatedDepType to dep_type_untranslated.
* python/tag.cc:
  - Hack the TagFile iterator to not use shared storage (Closes: #572596):
    Scan once, duplicate the section data, and scan again.
* apt/package.py:
  - Create a string class BaseDependency.__dstr which makes '>' equal to
    '>>' and '<' equal to '<<' (compatibility).
  - Use the binary package version in Version.fetch_source() if the
    source version is not specified (i.e. in the normal case).
  - Always return unicode strings in Package.get_changelog (Closes: #572998).
* apt/progress/text.py:
  - Drop InstallProgress, it's useless to keep this alias around.
* apt/progress/old.py:
  - Let the new method call the old one; e.g. status_update() now calls
    self.statusUpdate(). This improves compatibility for sub classes.
* Merge with Ubuntu:
  - util/get_ubuntu_mirrors_from_lp.py:
    + rewritten to use +archivemirrors-rss and feedburner
  - pre-build.sh: update ubuntu mirrors on bzr-buildpackage (and also do this
    for Debian mirrors)
  - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4)
* tests:
  - test_deps: Add tests for apt_pkg.CheckDep, apt_pkg.check_dep,
    apt_pkg.parse_depends and apt_pkg.parse_src_depends.
* tests/data/aptsources/sources.list.testDistribution:
  - change one mirror which is not on the mirror list anymore.
* utils/get_debian_mirrors.py:
  - Parse Mirrors.masterlist instead of the HTML web page.
* utils/get_ubuntu_mirrors_from_lp.py:
  - Sort the mirror list of each country.
  - Use generic MirrorsFile key instead of per-architecture ones in
    order to fix FTBFS on !amd64 !i386 (Closes: #571752)
[ Julian Andres Klode ]
* Fix some places where the old API was still used:
  - apt/utils.py: Completely ported, previous one was old-API from Ubuntu.
  - apt/cache.py: Use the new progress classes instead of the old ones.
  - apt/package.py: Various smaller issues fixed, probably caused by merge.
* utils/migrate-0.8.py:
  - Improve C++ parsing and add apt.progress.old to the modules, reduces
    false positives.
  - Ship the list of deprecated things in the apt_pkg and apt_inst modules
    inside the script itself, so we don't have to parse the source code
    anymore.
* python:
  - Handle deprecated attributes and methods in the tp_gettattro slot, this
    allows us to easily warn if a deprecated function is used.
* python/tagfile.cc:
  - Implement the iterator protocol in TagFile.
* python/cache.cc:
  - Implement Cache.__len__() and Cache.__contains__() (Closes: #571443).
* data/templates/Debian.info.in:
  - Replace the MatchURI with one that really matches something.
* aptsources/distro.py:
  - Call lsb_release with -idrc instead of --all.
* tests:
  - Fix aptsources tests to use local data files if available.
  - test_all.py: Use local modules instead of system ones if possible.
* data/templates/*.in: Switch MirrorsFile to relative filenames.
  - setup.py: Copy the mirror lists to the build directory
  - aptsources/distinfo.py: Support relative filenames for MirrorsFile.
* debian/rules:
  - Run tests during build time.
* debian/python-apt.install:
  - Install utils/migrate-0.8.py to /usr/share/python-apt/.

[ Michael Vogt ]
* apt/cache.py:
  - call install_progress.startUpdate()/finishUpdate() to keep
    compatibility with older code
* apt/progress/base.py:
  - restore "self.statusfd, self.writefd" type, provide additional
    self.status_stream and self.write_stream file like objects
* python/progress.cc:
  - try to call compatibility functions first, then new functions
[ Julian Andres Klode ]
* Fix reference counting for old progress classes (Closes: #566370).
* apt/cache.py:
  - Fix Cache.update() to not raise errors on successful updates.
* python/progress.cc:
  - Fix some threading issues (add some missing PyCbObj_BEGIN_ALLOW_THREADS)
* python/acquire-item.cc:
  - Support items without an owner set.
* python/tarfile.cc:
  - When extracting, only allocate a new buffer if the old one was too small.
  - Do not segfault if TarFile.go() is called without a member name.
  - Clone all pkgDirStream::Item's so apt_pkg.TarMember object can be used
    outside of the callback function passed to go().
  - If only one member is requested, extract just that one.
* Drop the segfault prevention measures from the Acquire code, as they fail
  to work. A replacement will be added once destruction callbacks are added
  in APT.
* Merge the CppOwnedPyObject C++ class into CppPyObject.
* Remove inline functions from the C++ API, export them instead.
* Localization
  - de.po: Update against new template
* python/arfile.cc:
  - Handle the case where ararchive_new returns NULL in debfile_new.
* apt/progress/base.py:
  - select.error objects do not have an errno attribute (Closes: #568005)
* doc/client-example.cc: Update against the new API.
* Fix typos of separated in multiple files (reported by lintian).
* debian/control:
  - Make python-apt-dev depend on ${misc:Depends} and recommend python-dev.
  - Set Standards-Version to 3.8.4.
[ Michael Vogt ]
[ Julian Andres Klode ]
* Merge debian-sid and debian-experimental.
* Add a tutorial on how to do things which are possible with apt-get,
  like apt-get --print-uris update (cf. #551164).
* Build for Python 2.5, 2.6 and 3.1; 2.6 and 3.1 hit unstable on Jan 16.
  - Use DH_PYCENTRAL=nomove for now because include-links seems broken
* Merge lp:~forest-bond/python-apt/cache-is-virtual-package-catch-key-error
  - Return False in Cache.is_virtual_package if the package does not exist.
* Make all class-level constants have uppercase names.
* Rewrite apt.progress.gtk2 documentation by hand and drop python-gtk2
  build-time dependency.
* aptsources:
  - Make all classes subclasses of object.
  - distro.py: Support Python 3, decode lsb_release results using utf-8.
* apt/progress/base.py:
  - Fix some parsing of dpkg status fd.
* apt/progress/text.py:
  - Replace one print statement with a .write() call.
* Rename apt_pkg.PackageIndexFile to apt_pkg.IndexFile.
[ Colin Watson ]
* apt/progress/__init__.py:
  - Fix InstallProgress.updateInterface() to cope with read() returning 0
    on non-blocking file descriptors (LP: #491027).

* New features:
  - Provide a C++ API in the package python-apt-dev (Closes: #334923).
  - Add apt_pkg.HashString and apt_pkg.IndexRecords (Closes: #456141).
  - Add apt_pkg.Policy class (Closes: #382725).
  - Add apt_pkg.Hashes class.
  - Allow types providing __new__() to be subclassed.
  - Add apt_pkg.DepCache.mark_auto() and apt.Package.mark_auto() methods to
    mark a package as automatically installed.
  - Make AcquireFile a subclass of AcquireItem, thus inheriting attributes.
  - New progress handling in apt.progress.base and apt.progress.text. Still
    missing Qt4 progress handlers.
  - Classes in apt_inst (Closes: #536096)
    + You can now use apt_inst.DebFile.data to access the data.tar.* member
      regardless of its compression (LP: #44493)
* Unification of dependency handling:
  - apt_pkg.parse_[src_]depends() now use CompType instead of CompTypeDeb
    (i.e. < instead of <<) to match the interface of Version.depends_list_str
  - apt_pkg.SourceRecords.build_depends matches exactly the interface of
    Version.depends_list_str just with different keys (e.g. Build-Depends).
    + Closes: #468123 - there is no need anymore for binding CompType or
      CompTypeDeb, because we don't return integer values for CompType
      anymore.
* Bugfixes:
  - Delete pointers correctly, fixing memory leaks (LP: #370149).
  - Drop open() and close() in apt_pkg.Cache as they cause segfaults.
  - Raise ValueError in AcquireItem if the Acquire process is shut down
    instead of segfaulting.
* Other stuff:
  - Merge releases 0.7.10.4 - 0.7.12.1 from unstable.
  - Merge Configuration,ConfigurationPtr,ConfigurationSub into one type.
  - Simplify the whole build process by using a single setup.py.
  - The documentation has been restructured and enhanced with tutorials.
  - Only recommend lsb-release instead of depending on it. Default to
    Debian unstable if lsb_release is not available.
[ Julian Andres Klode ]
* Rename where needed according to PEP 8 conventions (Closes: #481061)
* Where possible, derive apt.package.Record from collections.Mapping.
* ActionGroups can be used as a context manager for the 'with' statement.
* utils/migrate-0.8.py: Helper to check Python code for deprecated functions,
  attributes,etc. Has to be run from the python-apt source tree, but can be
  used for all Python code using python-apt.
* debian/control: Only recommend libjs-jquery (Closes: #527543).
[ Stefano Zacchiroli ]
* debian/python-apt.doc-base: register the documentation with the
  doc-base system (Closes: #525134)
[ Sebastian Heinlein ]
* apt/package.py: Add Package.get_version() which returns a Version instance
  for the given version string or None (Closes: #523998)
* Introduce support for Python 3 (Closes: #523645)
* Support the 'in' operator (e.g. "k in d") in Configuration{,Ptr,Sub}
  objects (e.g. apt_pkg.Config) and in TagSections (apt_pkg.ParseSection())
* Replace support for file objects with a more generic support for any object
  providing a fileno() method and for file descriptors (integers).
* Add support for the Breaks fields
* Only create Package objects when they are requested, do not keep them in
  a dict. Saves 10MB for 25,000 packages on my machine.
* apt/package.py: Allow to set the candidate of a package (Closes: #523997)
  - Support assignments to the 'candidate' property of Package objects.
  - Initial patch by Sebastian Heinlein
[ Michael Vogt ]
* data/templates/Ubuntu.info.in:
  - make armel point to ports.ubuntu.com (LP: #531876)
[ Emmet Hikory ]
* data/templates/Ubuntu.info.in:
  - refactor to use ports by default for gutsy and newer releases
  - Set appropriate exceptions to defaults for warty-lucid
* Drop build dependency on python2.4.
* apt/utils.py:
  - add some misc utils like get_release_filename_for_pkg()
[ Michael Vogt ]
* apt/cache.py: 
  - improved docstring for the cache
  - add "enhances" property
* data/templates/Ubuntu.info.in:
  - add lucid
* python/cache.cc:
  - add UntranslatedDepType attribute to DependencyType
  - add DepTypeEnum that returns a value from 
    {DepDepends, DepPreDepends, ...}
* python/apt_pkgmodule.cc:
  - add DepDpkgBreaks, DepEnhances constants
* doc/source/apt_pkg/{cache.rst, index.rst}:
  - update documentation as well
* Fix FTBFS with python-debian (>= 0.1.13) on Python 2.4 by not using it to
  get a version number in setup.py (Closes: #523473)
* apt/package.py:
  - (Package.candidateRecord): Fix missing 'd' in 'record'
  - (DeprecatedProperty.__get__): Only warn when used on objects, this
    makes it easier to use e.g. pydoc,sphinx,pychecker.
* Merged python-apt consolidation branch by Sebastian
  Heinlein (many thanks)
* apt/cache.py:
  - new method "isVirtualPackage()"
  - new method "getProvidingPackages()"
  - new method "getRequiredDownload()"
  - new method "additionalRequiredSpace()"
* apt/debfile.py:
  - move a lot of the gdebi code into this file, this
    provides interfaces for querrying and installing
    .deb files and .dsc files
* apt/package.py:
  - better description parsing
  - new method "installedFiles()"
  - new method "getChangelog()"
* apt/gtk/widgets.py:
  - new gobject GOpProgress
  - new gobject GFetchProgress
  - new gobject GInstallProgress
  - new gobject GDpkgInstallProgress
  - new widget GtkAptProgress
* doc/examples/gui-inst.py:
  - updated to use the new widgets
* debian/control:
  - add suggests for python-gtk2 and python-vte
* setup.py:
  - build html/ help of the apt and aptsources modules
    into /usr/share/doc/python-apt/html
* apt/__init__.py:
  - remove the future warning
* Non-maintainer upload.
* data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
  lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
* data/templates/Debian.info.in:
  - add 'lenny' template info (closes: #476364)
* aptsources/distinfo.py:
  - fix template matching for arch specific code (LP: #244093)

1 files changed, 258 insertions, 0 deletions

diff --git a/apt/progress/old.py b/apt/progress/old.py
new file mode 100644
index 00000000..4bd79f2e
--- /dev/null
+++ b/apt/progress/old.py
@@ -0,0 +1,258 @@
+# progress.py - progress reporting classes
+#
+#  Copyright (c) 2005-2009 Canonical
+#
+#  Author: Michael Vogt <michael.vogt@ubuntu.com>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+#  USA
+# pylint: disable-msg = C0103
+"""Deprecated progress reporting classes.
+
+This module provides classes for compatibility with python-apt 0.7. They are
+completely deprecated and should not be used anymore.
+"""
+
+
+import os
+import sys
+
+import apt_pkg
+from apt.deprecation import AttributeDeprecatedBy, function_deprecated_by
+import warnings
+from apt.progress import base, text
+
+__all__ = []
+
+
+class OpProgress(base.OpProgress):
+    """Abstract class to implement reporting on cache opening."""
+
+    def __init__(self):
+        base.OpProgress.__init__(self)
+        warnings.warn("apt.progress.OpProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    subOp = AttributeDeprecatedBy('subop')
+    Op = AttributeDeprecatedBy('op')
+
+
+class OpTextProgress(OpProgress, text.OpProgress):
+    """A simple text based cache open reporting class."""
+
+    def __init__(self):
+        text.OpProgress.__init__(self)
+        warnings.warn("apt.progress.OpTextProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+
+class FetchProgress(object):
+    """Report the download/fetching progress."""
+
+    # download status constants
+    (dlDone, dlQueued, dlFailed, dlHit, dlIgnored) = range(5)
+    dlStatusStr = {dlDone: "Done", dlQueued: "Queued", dlFailed: "Failed",
+                     dlHit: "Hit", dlIgnored: "Ignored"}
+
+    def __init__(self):
+        self.eta = 0.0
+        self.percent = 0.0
+        # Make checking easier
+        self.currentBytes = 0
+        self.currentItems = 0
+        self.totalBytes = 0
+        self.totalItems = 0
+        self.currentCPS = 0
+        warnings.warn("apt.progress.FetchProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    def start(self):
+        """Called when the fetching starts."""
+
+    def stop(self):
+        """Called when all files have been fetched."""
+
+    def updateStatus(self, uri, descr, short_descr, status):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed.
+        """
+
+    def update_status_full(self, uri, descr, short_descr, status, file_size,
+                           partial_size):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed. This
+        version include information on current filesize and partial size
+        """
+
+    def pulse(self):
+        """Called periodically to update the user interface.
+
+        Return True to continue or False to cancel.
+        """
+        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
+                        float(self.totalBytes + self.totalItems))
+        if self.currentCPS > 0:
+            self.eta = ((self.totalBytes - self.currentBytes) /
+                        float(self.currentCPS))
+        return True
+
+    def pulse_items(self, items):
+        """Called periodically to update the user interface.
+        This function includes details about the items being fetched
+        Return True to continue or False to cancel.
+
+        """
+        self.percent = (((self.currentBytes + self.currentItems) * 100.0) /
+                        float(self.totalBytes + self.totalItems))
+        if self.currentCPS > 0:
+            self.eta = ((self.totalBytes - self.currentBytes) /
+                        float(self.currentCPS))
+        return True
+
+    def mediaChange(self, medium, drive):
+        """react to media change events."""
+
+
+class TextFetchProgress(FetchProgress):
+    """ Ready to use progress object for terminal windows """
+
+    def __init__(self):
+        FetchProgress.__init__(self)
+        self.items = {}
+
+    def updateStatus(self, uri, descr, short_descr, status):
+        """Called when the status of an item changes.
+
+        This happens eg. when the downloads fails or is completed.
+        """
+        if status != self.dlQueued:
+            print "\r%s %s" % (self.dlStatusStr[status], descr)
+        self.items[uri] = status
+
+    def pulse(self):
+        """Called periodically to update the user interface.
+
+        Return True to continue or False to cancel.
+        """
+        FetchProgress.pulse(self)
+        if self.currentCPS > 0:
+            s = "[%2.f%%] %sB/s %s" % (self.percent,
+                                    apt_pkg.size_to_str(int(self.currentCPS)),
+                                    apt_pkg.time_to_str(int(self.eta)))
+        else:
+            s = "%2.f%% [Working]" % (self.percent)
+        print "\r%s" % (s),
+        sys.stdout.flush()
+        return True
+
+    def stop(self):
+        """Called when all files have been fetched."""
+        print "\rDone downloading            "
+
+    def mediaChange(self, medium, drive):
+        """react to media change events."""
+        print ("Media change: please insert the disc labeled "
+               "'%s' in the drive '%s' and press enter") % (medium, drive)
+
+        return raw_input() not in ('c', 'C')
+
+
+class CdromProgress(object):
+    """Report the cdrom add progress."""
+
+    def __init__(self):
+        warnings.warn("apt.progress.CdromProgress is deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    def askCdromName(self):
+        """Ask for a cdrom name"""
+
+    def changeCdrom(self):
+        """Change cdrom"""
+
+    def update(self, text, current):
+        """Update."""
+
+
+class DumbInstallProgress(base.InstallProgress):
+    """Report the install progress."""
+
+    def __init__(self):
+        base.InstallProgress.__init__(self)
+        warnings.warn("apt.progress.*InstallProgress are deprecated.",
+                      DeprecationWarning, stacklevel=2)
+
+    def updateInterface(self):
+        # *_stream were not available in the old progress reporting classes,
+        # create the attributes if they do not exist yet; as they are used
+        # in base.InstallProgress.update_interface().
+        if hasattr(self, "writefd") and not hasattr(self, "write_stream"):
+            self.write_stream = os.fdopen(self.writefd, "w")
+        if hasattr(self, "statusfd") and not hasattr(self, "status_stream"):
+            self.status_stream = os.fdopen(self.statusfd, "r")
+        return base.InstallProgress.update_interface(self)
+
+    def update_interface(self):
+        return self.updateInterface()
+
+    def startUpdate(self):
+        return base.InstallProgress.start_update(self)
+
+    def start_update(self):
+        return self.startUpdate()
+
+    def finishUpdate(self):
+        return base.InstallProgress.finish_update(self)
+
+    def finish_update(self):
+        return self.finishUpdate()
+
+
+class InstallProgress(DumbInstallProgress, base.InstallProgress):
+    """An InstallProgress that is pretty useful.
+
+    It supports the attributes 'percent' 'status' and callbacks for the dpkg
+    errors and conffiles and status changes.
+    """
+
+    selectTimeout = AttributeDeprecatedBy('select_timeout')
+
+    def statusChange(self, pkg, percent, status):
+        return base.InstallProgress.status_change(self, pkg, percent, status)
+
+    def status_change(self, pkg, percent, status):
+        return self.statusChange(pkg, percent, status)
+
+    def waitChild(self):
+        return base.InstallProgress.wait_child(self)
+
+    def wait_child(self):
+        return self.waitChild()
+
+
+class DpkgInstallProgress(InstallProgress):
+    """Progress handler for a local Debian package installation."""
+
+    debfile = ""
+    debname = ""
+
+    def run(self, debfile):
+        """Start installing the given Debian package."""
+        # Deprecated stuff
+        self.debfile = debfile
+        self.debname = os.path.basename(debfile).split("_")[0]
+        return base.InstallProgress.run(self, debfile)