From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 22 Nov 2018 02:09:00 +0000 (+1300)
Subject: traffic: remove useless branch in stats report
X-Git-Tag: tdb-1.3.17~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db51004307a19447bb0ca2259cd7a49f4efc1874;p=thirdparty%2Fsamba.git

traffic: remove useless branch in stats report

This completes the work of 68c64c634ad7576b2ab5ef838c203320afd90f44,
but differs from that in that it makes no actual change because isatty
was not being called so was always evaluated as true.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 4545ca887f2..9bcd75f4e6e 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -2243,31 +2243,18 @@ def generate_stats(statsdir, timing_file):
             rng        = values[-1] - values[0]
             maxv       = values[-1]
             desc       = OP_DESCRIPTIONS.get(op, '')
-            if sys.stdout.isatty:
-                print("%-12s   %4s  %-35s %12d %12d %12.6f "
-                      "%12.6f %12.6f %12.6f %12.6f"
-                      % (protocol,
-                         packet_type,
-                         desc,
-                         count,
-                         failed,
-                         mean,
-                         median,
-                         percentile,
-                         rng,
-                         maxv))
-            else:
-                print("%s\t%s\t%s\t%d\t%d\t%f\t%f\t%f\t%f\t%f"
-                      % (protocol,
-                         packet_type,
-                         desc,
-                         count,
-                         failed,
-                         mean,
-                         median,
-                         percentile,
-                         rng,
-                         maxv))
+            print("%-12s   %4s  %-35s %12d %12d %12.6f "
+                  "%12.6f %12.6f %12.6f %12.6f"
+                  % (protocol,
+                     packet_type,
+                     desc,
+                     count,
+                     failed,
+                     mean,
+                     median,
+                     percentile,
+                     rng,
+                     maxv))
 
 
 def opcode_key(v):