From: Guido van Rossum <guido@python.org>
Date: Thu, 25 Feb 1993 00:16:27 +0000 (+0000)
Subject: Fix terse mode for printing tuple packfactor and to avoid zero division
X-Git-Tag: v0.9.9~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83c81448b1db067a8eeea140afbde525499f507b;p=thirdparty%2FPython%2Fcpython.git

Fix terse mode for printing tuple packfactor and to avoid zero division
---

diff --git a/Demo/sgi/video/Vinfo.py b/Demo/sgi/video/Vinfo.py
index 77ae3a33166a..8d163a178fcf 100755
--- a/Demo/sgi/video/Vinfo.py
+++ b/Demo/sgi/video/Vinfo.py
@@ -87,12 +87,18 @@ def process(filename):
 		print string.ljust(vin.format, 8),
 		print string.rjust(`vin.width`, 4),
 		print string.rjust(`vin.height`, 4),
-		s = string.rjust(`vin.packfactor`, 2)
-		if vin.packfactor and vin.format not in ('rgb', 'jpeg') and \
-			  (vin.width/vin.packfactor) % 4 <> 0:
-			s = s + '!'
+		if type(vin.packfactor) == type(()):
+			xpf, ypf = vin.packfactor
+			s = string.rjust(`xpf`, 2) + ',' + \
+				  string.rjust(`ypf`, 2)
 		else:
-			s = s + ' '
+			s = string.rjust(`vin.packfactor`, 2)
+			if type(vin.packfactor) == type(0) and \
+				  vin.format not in ('rgb', 'jpeg') and \
+				  (vin.width/vin.packfactor) % 4 <> 0:
+				s = s + '!  '
+			else:
+				s = s + '   '
 		print s,
 		sys.stdout.flush()
 	else:
@@ -144,7 +150,8 @@ def process(filename):
 
 	if terse:
 		print string.rjust(`n`, 6),
-		print string.rjust(`int(n*10000.0/t)*0.1`, 5)
+		if t: print string.rjust(`int(n*10000.0/t)*0.1`, 5),
+		print
 	else:
 		print 'Total', n, 'frames in', t*0.001, 'sec.',
 		if t: print '-- average', int(n*10000.0/t)*0.1, 'frames/sec',