* apt/gtk/widgets.py:

  - Handle older versions of python-gobject which do not ship glib
* apt/package.py: Introduce the Version class
  - Deprecate Package.candidate*() and Package.installed*(), except for
    installedFiles.
  - Provide Version.get_source() (LP: #118788)
  - Provide Package.versions (Closes: #513236)
* apt/progress/: New package, replaces apt.progress and apt.gtk
  - apt/progress/gtk2.py: Moved here from apt/gtk/widgets.py
  - apt/progress/__init__.py: Move here from apt/progress.py
* doc/source/*: Improve the documentation
  - Document more attributes and functions of apt_pkg (they are all listed)
* aptsources/distro.py:
  - use iso_3166.xml instead of iso_3166.tab
  - fix incorrect indent
* debian/control:
  - add Recommends to iso-codes (for iso_3166.xml)
* apt/package.py:
  - make sure to set the defaulttimeout back to the
    original value (in getChangelog(), LP: #314212)
* apt/cache.py:
  - when setting a alternative rootdir, read the
    config from it as well
* python/configuration.cc, python/apt_pkgmodule.cc:
  - add apt_pkg.ReadConfigDir()
* python/cache.cc, tests/getcache_mem_corruption.py:
  - test if progress objects have the right methods
    and raise error if not (thanks to Emanuele Rocca)
    closes: #497049
* apt/package.py:
  - avoid uneeded interal references in the Package objects
* apt/__init__.py:
  - remove the future warning

1 files changed, 5 insertions, 3 deletions

diff --git a/doc/examples/progress.py b/doc/examples/progress.py
index 83847598..2231001f 100644
--- a/doc/examples/progress.py
+++ b/doc/examples/progress.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+
 import sys
 import time
 
@@ -38,7 +40,7 @@ class TextFetchProgress(apt.FetchProgress):
 
     def pulse(self):
         print "Pulse: CPS: %s/s; Bytes: %s/%s; Item: %s/%s" % (
-            apt.SizeToStr(self.currentCPS), SizeToStr(self.currentBytes),
+            apt.SizeToStr(self.currentCPS), apt.SizeToStr(self.currentBytes),
             apt.SizeToStr(self.totalBytes), self.currentItems, self.totalItems)
         return True
 
@@ -79,12 +81,12 @@ class TextCdromProgress(apt.CdromProgress):
     def update(self, text, step):
         # check if we actually have some text to display
         if text != "":
-            print "Update: %s %s" % (string.strip(text), step)
+            print "Update: %s %s" % (text.strip(), step)
 
     def askCdromName(self):
         print "Please enter cd-name: ",
         cd_name = sys.stdin.readline()
-        return (True, string.strip(cd_name))
+        return (True, cd_name.strip())
 
     def changeCdrom(self):
         print "Please insert cdrom and press <ENTER>"