From owner-svn-src-all@FreeBSD.ORG  Thu Oct 25 03:15:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B5911E46;
 Thu, 25 Oct 2012 03:15:33 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 9C9818FC12;
 Thu, 25 Oct 2012 03:15:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9P3FXdg058898;
 Thu, 25 Oct 2012 03:15:33 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9P3FXu2058896;
 Thu, 25 Oct 2012 03:15:33 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210250315.q9P3FXu2058896@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 25 Oct 2012 03:15:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r242042 - stable/8/tools/regression/netinet/ip_id_period
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Oct 2012 03:15:33 -0000

Author: eadler
Date: Thu Oct 25 03:15:33 2012
New Revision: 242042
URL: http://svn.freebsd.org/changeset/base/242042

Log:
  MFC r241832:
  	Covert regression test to python 3
  
  Approved by:	cperciva (implicit)

Modified:
  stable/8/tools/regression/netinet/ip_id_period/ip_id_period.py
Directory Properties:
  stable/8/tools/regression/netinet/   (props changed)

Modified: stable/8/tools/regression/netinet/ip_id_period/ip_id_period.py
==============================================================================
--- stable/8/tools/regression/netinet/ip_id_period/ip_id_period.py	Thu Oct 25 03:15:24 2012	(r242041)
+++ stable/8/tools/regression/netinet/ip_id_period/ip_id_period.py	Thu Oct 25 03:15:33 2012	(r242042)
@@ -51,26 +51,26 @@ id_minperiod = {}
 count = 0
 for line in open('results.txt').readlines():
     id = int(line.split(' id ')[1].split(',')[0])
-    if id_lastseen.has_key(id):
+    if id in id_lastseen:
         period = count - id_lastseen[id]
-        if not id_minperiod.has_key(id) or period < id_minperiod[id]:
+        if id not in id_minperiod or period < id_minperiod[id]:
             id_minperiod[id] = period
     id_lastseen[id] = count
     count += 1
 
-sorted_minperiod = zip(*reversed(zip(*id_minperiod.items())))
+sorted_minperiod = list(zip(*reversed(list(zip(*list(id_minperiod.items()))))))
 sorted_minperiod.sort()
 
-print "Lowest 10 ID periods detected:"
+print("Lowest 10 ID periods detected:")
 x = 0
 while x < 10:
     id_tuple = sorted_minperiod.pop(0)
-    print "id: %d period: %d" % (id_tuple[1], id_tuple[0])
+    print("id: %d period: %d" % (id_tuple[1], id_tuple[0]))
     x += 1
 
-print "Highest 10 ID periods detected:"
+print("Highest 10 ID periods detected:")
 x = 0
 while x < 10:
     id_tuple = sorted_minperiod.pop()
-    print "id: %d period: %d" % (id_tuple[1], id_tuple[0])
+    print("id: %d period: %d" % (id_tuple[1], id_tuple[0]))
     x += 1