merge from the debian-unstable tree

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/examples/progress.py b/doc/examples/progress.py
index 304bd117..2231001f 100644
--- a/doc/examples/progress.py
+++ b/doc/examples/progress.py
@@ -40,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
 
@@ -81,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>"