From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 27 Nov 2013 03:23:45 +0000 (-0500)
Subject: countdown: clean up & simplify a bit
X-Git-Tag: v2.2.8~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=719b1c87918426fa3ae8c389779dece18e12a9ea;p=portage.git

countdown: clean up & simplify a bit
---

diff --git a/pym/_emerge/countdown.py b/pym/_emerge/countdown.py
index 5abdc8a96..62e3c8dea 100644
--- a/pym/_emerge/countdown.py
+++ b/pym/_emerge/countdown.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -8,15 +8,15 @@ import time
 
 from portage.output import colorize
 
-def countdown(secs=5, doing="Starting"):
+
+def countdown(secs=5, doing='Starting'):
 	if secs:
-		print(">>> Waiting",secs,"seconds before starting...")
-		print(">>> (Control-C to abort)...\n"+doing+" in: ", end=' ')
-		ticks=list(range(secs))
-		ticks.reverse()
-		for sec in ticks:
-			sys.stdout.write(colorize("UNMERGE_WARN", str(sec+1)+" "))
+		print(
+			'>>> Waiting %s seconds before starting...\n'
+			'>>> (Control-C to abort)...\n'
+			'%s in:' % (secs, doing), end='')
+		for sec in range(secs, 0, -1):
+			sys.stdout.write(colorize('UNMERGE_WARN', ' %i' % sec))
 			sys.stdout.flush()
 			time.sleep(1)
 		print()
-