From b575e6b97efdf3a07f883b9cc1f0c8ee7cdae136 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@herrb.eu>
Date: Sun, 7 Aug 2022 18:28:10 +0200
Subject: [PATCH] Convert to python 3

---
 plog95.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/plog95.py b/plog95.py
index 9a0b69c..cb2b7e4 100644
--- a/plog95.py
+++ b/plog95.py
@@ -1,3 +1,5 @@
+#! /usr/bin/env python3
+
 # Laurent GUERBY 20150728
 # parse log-netdev-20120629.txt compute 95th centile 5mn
 # python plog95.py b 0 eth0.2301  log-netdev-201506*.txt
@@ -42,6 +44,7 @@ for fname in sys.argv[4:]:
    line_i=0
    for l in f:
        line_i+=1
+       # l = l.decode('ascii');
        if l.startswith("=== ") and l.endswith(" ===\n"):
            t_s=to_date(l[4:-5])
            d[t_s]={}
@@ -54,25 +57,25 @@ for fname in sys.argv[4:]:
            try:
                header,data=l[:-1].split(":")
            except:
-               print l
-               print fname
-               print line_i
-               raise
+               print(l)
+               print(fname)
+               print(line_i)
+               #raise
            iface=header.strip(" ")
            if iface!=iface95: continue
            bytes=[int(x) for x in re.findall(r'\w+', data)]
            d[t_s][iface]={"b":[bytes[0],bytes[8]],"p":[bytes[1],bytes[9]]}
 
-#print len(t_l)
+#print(len(t_l))
 
 iface_d={}
 for t in t_l:
-    for i in d[t].iterkeys(): 
+    for i in d[t].keys():
         iface_d[i]=None
 
 iface_l=iface_d.keys()
-iface_l.sort()
-#print len(iface_l)
+#iface_l.sort()
+#print(len(iface_l))
 
 #print "T,",",".join(iface_l)
 prev={}
@@ -89,19 +92,19 @@ for t in t_l:
     for i in iface_l:
         y=0
         x=None
-        if d[t].has_key(i):
+        if i in d[t]:
             x=d[t][i][b_or_p][txrx]
         if prev[i]!=None and x!=None:
             y=x-prev[i]
         if y<0.0: y=0
         s+=",%d"%y
         mbit_s=float(y)*8.0/300.0e6
-        if mbit_s>600.0: print to_datetime(t),mbit_s
+        #if mbit_s>600.0: print to_datetime(t),mbit_s
         if mbit_s>10000.0: mbit_s=0.0
         mb_l.append(mbit_s)
         prev[i]=x
-    #print s
+    #print(s)
 
 mb_l.sort()
 mb_n=len(mb_l)
-print "nb",mb_n,"avg",sum(mb_l)/mb_n,"median",mb_l[mb_n/2],"90eme",mb_l[int(0.90*mb_n)],"95eme",mb_l[int(0.95*mb_n)],"max",mb_l[mb_n-1]
+print("nb",mb_n,"avg",sum(mb_l)/mb_n,"median",mb_l[int(mb_n/2)],"90eme",mb_l[int(0.90*mb_n)],"95eme",mb_l[int(0.95*mb_n)],"max",mb_l[mb_n-1])