Merged with lp:python-apt.

1 files changed, 15 insertions, 5 deletions

diff --git a/doc/examples/progress.py b/doc/examples/progress.py
index f7650f69..c007681f 100644
--- a/doc/examples/progress.py
+++ b/doc/examples/progress.py
@@ -34,12 +34,22 @@ class TextFetchProgress(apt.FetchProgress):
     def stop(self):
         pass
 
-    def updateStatus(self, uri, descr, shortDescr, status, fileSize, 
-                     partialSize):
-        print "UpdateStatus: '%s' '%s' '%s' '%i' '%d/%d'" % (
+    def updateStatus(self, uri, descr, shortDescr, status):
+        print "UpdateStatus: '%s' '%s' '%s' '%i' " % (
+            uri, descr, shortDescr, status)
+
+    def update_status_full(self, uri, descr, shortDescr, status, fileSize, 
+                           partialSize):
+        print "update_status_full: '%s' '%s' '%s' '%i' '%d/%d'" % (
             uri, descr, shortDescr, status, partialSize, fileSize)
 
-    def pulse(self, items):
+    def pulse(self):
+        print "Pulse: CPS: %s/s; Bytes: %s/%s; Item: %s/%s" % (
+            apt.SizeToStr(self.currentCPS), apt.SizeToStr(self.currentBytes),
+            apt.SizeToStr(self.totalBytes), self.currentItems, self.totalItems)
+        return True
+
+    def pulse_items(self, items):
         print "Pulse: CPS: %s/s; Bytes: %s/%s; Item: %s/%s" % (
             apt.SizeToStr(self.currentCPS), apt.SizeToStr(self.currentBytes),
             apt.SizeToStr(self.totalBytes), self.currentItems, self.totalItems)
@@ -47,7 +57,7 @@ class TextFetchProgress(apt.FetchProgress):
         for itm in items:
             uri, descr, shortDescr, fileSize, partialSize = itm
             print " - '%s' '%s' '%s' '%d/%d'" % (
-                uri, descr, shortDescr, partialSize, fileSize
+                uri, descr, shortDescr, partialSize, fileSize)
         return True
 
     def mediaChange(self, medium, drive):