From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Jun 2013 16:51:10 +0000 (+0200)
Subject: progressbar: Remove overwriting the Bar class.
X-Git-Tag: 0.9.26~10^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b0854638bedee5ef9078be8b3062bfbbd584e7a;p=pakfire.git

progressbar: Remove overwriting the Bar class.
---

diff --git a/python/pakfire/util.py b/python/pakfire/util.py
index 84128cd9c..8d917092e 100644
--- a/python/pakfire/util.py
+++ b/python/pakfire/util.py
@@ -79,19 +79,6 @@ def random_string(length=20):
 
 	return s
 
-
-class Bar(progressbar.Bar):
-	def update(self, pbar, width):
-		percent = pbar.percentage()
-		if pbar.finished:
-			return " " * width
-
-		cwidth = width - len(self.left) - len(self.right)
-		marked_width = int(percent * cwidth / 100)
-		m = self._format_marker(pbar)
-		bar = (self.left + (m*marked_width).ljust(cwidth) + self.right)
-		return bar
-
 def make_progress(message, maxval, eta=True, speed=False):
 	# Return nothing if stdout is not a terminal.
 	if not sys.stdout.isatty():
@@ -101,7 +88,7 @@ def make_progress(message, maxval, eta=True, speed=False):
 		"  ",
 		"%s" % message,
 		" ",
-		Bar(left="[", right="]"),
+		progressbar.Bar(left="[", right="]"),
 		"  ",
 	]