From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93B5DA00C5; Thu, 2 Jul 2020 12:37:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4BC5B1D937; Thu, 2 Jul 2020 12:37:23 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 922671D916 for ; Thu, 2 Jul 2020 12:37:21 +0200 (CEST) IronPort-SDR: Rz3sIA0jm73E8RFRNLtzpwk3ZEE/NMJpIKsjORSbkES+Ni4c3UiaG4kJcmiroHwPch9Hm1opti aXqMKvQ9IiKQ== X-IronPort-AV: E=McAfee;i="6000,8403,9669"; a="144374779" X-IronPort-AV: E=Sophos;i="5.75,304,1589266800"; d="scan'208";a="144374779" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2020 03:37:21 -0700 IronPort-SDR: GjYx7Wd5VB1TfpE0sbDUrwOAYIBoeKIEtnLNChbRBww6nVAOtS7Urceez0IAheIinBlD6k7OLL +gmr7fAWwouQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,304,1589266800"; d="scan'208";a="304204632" Received: from silpixa00389033.ir.intel.com (HELO silpixa00389033.ger.corp.intel.com) ([10.237.223.171]) by fmsmga004.fm.intel.com with ESMTP; 02 Jul 2020 03:37:20 -0700 From: Louise Kilheeney To: dev@dpdk.org Cc: robin.jarry@6wind.com, anatoly.burakov@intel.com, bruce.richardson@intel.com, Louise Kilheeney Date: Thu, 2 Jul 2020 11:37:05 +0100 Message-Id: <20200702103712.13992-3-louise.kilheeney@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200702103712.13992-1-louise.kilheeney@intel.com> References: <20200522132320.26373-1-louise.kilheeney@intel.com> <20200702103712.13992-1-louise.kilheeney@intel.com> Subject: [dpdk-dev] [PATCH v3 2/9] usertools/dpdk-devbind: 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" Changed script to explicitly use python3 only to avoid maintaining python 2. Signed-off-by: Louise Kilheeney Reviewed-by: Anatoly Burakov --- v3: removed extra white space v2: removed check_output function as not required for python3. --- usertools/dpdk-devbind.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py index dc008823f..3e7d525e8 100755 --- a/usertools/dpdk-devbind.py +++ b/usertools/dpdk-devbind.py @@ -1,9 +1,8 @@ -#! /usr/bin/env python +#!/usr/bin/env python3 # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation # -from __future__ import print_function import sys import os import getopt @@ -143,14 +142,6 @@ def usage(): """ % locals()) # replace items from local variables - -# This is roughly compatible with check_output function in subprocess module -# which is only available in python 2.7. -def check_output(args, stderr=None): - '''Run a command and capture its output''' - return subprocess.Popen(args, stdout=subprocess.PIPE, - stderr=stderr).communicate()[0] - # check if a specific kernel module is loaded def module_is_loaded(module): global loaded_modules @@ -207,7 +198,7 @@ def get_pci_device_details(dev_id, probe_lspci): device = {} if probe_lspci: - extra_info = check_output(["lspci", "-vmmks", dev_id]).splitlines() + extra_info = subprocess.check_output(["lspci", "-vmmks", dev_id]).splitlines() # parse lspci details for line in extra_info: @@ -244,7 +235,7 @@ def get_device_details(devices_type): # first loop through and read details for all devices # request machine readable format, with numeric IDs and String dev = {} - dev_lines = check_output(["lspci", "-Dvmmnnk"]).splitlines() + dev_lines = subprocess.check_output(["lspci", "-Dvmmnnk"]).splitlines() for dev_line in dev_lines: if len(dev_line) == 0: if device_type_match(dev, devices_type): @@ -272,7 +263,7 @@ def get_device_details(devices_type): # check what is the interface if any for an ssh connection if # any to this host, so we can mark it later. ssh_if = [] - route = check_output(["ip", "-o", "route"]) + route = subprocess.check_output(["ip", "-o", "route"]) # filter out all lines for 169.254 routes route = "\n".join(filter(lambda ln: not ln.startswith("169.254"), route.decode().splitlines())) -- 2.17.1