From patchwork Mon Sep 28 10:43:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 78998 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B72C8A04C3; Mon, 28 Sep 2020 12:49:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 557BB1D72B; Mon, 28 Sep 2020 12:48:11 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 6F0631D714 for ; Mon, 28 Sep 2020 12:48:00 +0200 (CEST) IronPort-SDR: dfmfen6Khn3nV1643jO/rg+F8dtgGQqRCNut3AvtPAmmz4+Rkt+yhG6g+Et//rdY41lWw0PxS9 p99Q/WdZoXlA== X-IronPort-AV: E=McAfee;i="6000,8403,9757"; a="141988896" X-IronPort-AV: E=Sophos;i="5.77,313,1596524400"; d="scan'208";a="141988896" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2020 03:47:59 -0700 IronPort-SDR: uVCyPDQ7owFTBhT5UMRVOwoCvA3JMWICfF/oUuECRqqg8XNXSH1DkknjZC+dmP4ypP6MPSR9WN l4iBV4oHxsgg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,313,1596524400"; d="scan'208";a="488524293" Received: from silpixa00399838.ir.intel.com ([10.237.213.224]) by orsmga005.jf.intel.com with ESMTP; 28 Sep 2020 03:47:58 -0700 From: Kevin Laatz To: dev@dpdk.org Cc: bruce.richardson@intel.com, anatoly.burakov@intel.com, robin.jarry@6wind.com, david.marchand@redhat.com, Louise Kilheeney Date: Mon, 28 Sep 2020 11:43:22 +0100 Message-Id: <20200928104328.409055-5-kevin.laatz@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928104328.409055-1-kevin.laatz@intel.com> References: <20200921120357.220588-1-kevin.laatz@intel.com> <20200928104328.409055-1-kevin.laatz@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v8 04/10] usertools/cpu_layout: support python3 only X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Louise Kilheeney Changed script to explicitly use python3 only to avoid maintaining python 2 and removed deprecation notice. Signed-off-by: Louise Kilheeney Reviewed-by: Bruce Richardson Acked-by: Robin Jarry --- usertools/cpu_layout.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py index 5423c7965f..89a48cec46 100755 --- a/usertools/cpu_layout.py +++ b/usertools/cpu_layout.py @@ -1,18 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # Copyright(c) 2017 Cavium, Inc. All rights reserved. -from __future__ import print_function import sys -try: - xrange # Python 2 -except NameError: - xrange = range # Python 3 - -if sys.version_info.major < 3: - print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr) - print("Please use Python 3 instead", file=sys.stderr) sockets = [] cores = [] @@ -21,7 +12,7 @@ fd = open("{}/kernel_max".format(base_path)) max_cpus = int(fd.read()) fd.close() -for cpu in xrange(max_cpus + 1): +for cpu in range(max_cpus + 1): try: fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu)) except IOError: