From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Aug 2008 09:37:44 +0000 (-0000)
Subject: The fpformat module is deprecated and will be removed in py3k.
X-Git-Tag: v2.2_rc9~93
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=733ea688c0ae837c209b7983c193e490012d3307;p=portage.git

The fpformat module is deprecated and will be removed in py3k.
The % string interpolation operator should be used instead.
Thanks to Ali Polatel <hawking@g.o> for this patch.

svn path=/main/trunk/; revision=11406
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7a5c74342..9bc06db22 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -24,7 +24,6 @@ import array
 from collections import deque
 import fcntl
 import formatter
-import fpformat
 import logging
 import select
 import shlex
@@ -8674,7 +8673,7 @@ class JobStatusDisplay(object):
 			avg = os.getloadavg()
 		except OSError, e:
 			return str(e)
-		return ", ".join(fpformat.fix(x, digits) for x in avg)
+		return ", ".join(("%%.%df" % digits ) % x for x in avg)
 
 	def display(self):
 		"""