From: Stephen Hemminger <stephen@networkplumber.org>
To: nhorman@tuxdriver.com
Cc: dev@dpdk.org, Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v2 6/7] dpdk-pmdinfo: replace deprecated optparse with argparse
Date: Tue, 3 Nov 2020 22:48:41 -0800 [thread overview]
Message-ID: <20201104064842.25832-7-stephen@networkplumber.org> (raw)
In-Reply-To: <20201104064842.25832-1-stephen@networkplumber.org>
The optparse module is deprecated and replaced with new argparse.
The code now enforces the rule that only one of the output formats
can be specified: raw or json.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
usertools/dpdk-pmdinfo.py | 70 ++++++++++++++++++---------------------
1 file changed, 32 insertions(+), 38 deletions(-)
diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py
index aec2abe9a683..1c2c3d05fea6 100755
--- a/usertools/dpdk-pmdinfo.py
+++ b/usertools/dpdk-pmdinfo.py
@@ -11,10 +11,11 @@
import os
import platform
import sys
+import argparse
from elftools.common.exceptions import ELFError
from elftools.common.py3compat import byte2int
from elftools.elf.elffile import ELFFile
-from optparse import OptionParser
+
# For running from development directory. It should take precedence over the
# installed pyelftools.
@@ -563,56 +564,49 @@ def main(stream=None):
if not os.path.exists(pcifile_default):
pcifile_default = "/usr/share/misc/pci_vendors"
- optparser = OptionParser(
- usage='usage: %prog [-hrtp] [-d <pci id file] <elf-file>',
- description="Dump pmd hardware support info",
- add_help_option=True)
- optparser.add_option('-r', '--raw',
- action='store_true', dest='raw_output',
- help='Dump raw json strings')
- optparser.add_option("-d", "--pcidb", dest="pcifile",
- help="specify a pci database "
- "to get vendor names from",
- default=pcifile_default, metavar="FILE")
- optparser.add_option("-t", "--table", dest="tblout",
- help="output information on hw support as a "
- "hex table",
- action='store_true')
- optparser.add_option("-p", "--plugindir", dest="pdir",
- help="scan dpdk for autoload plugins",
- action='store_true')
-
- options, args = optparser.parse_args()
-
- if options.raw_output:
+ parser = argparse.ArgumentParser(
+ usage='usage: %(prog)s [-hrtp] [-d <pci id file>] elf_file',
+ description="Dump pmd hardware support info")
+ group = parser.add_mutually_exclusive_group()
+ group.add_argument('-r', '--raw',
+ action='store_true', dest='raw_output',
+ help='dump raw json strings')
+ group.add_argument("-t", "--table", dest="tblout",
+ help="output information on hw support as a hex table",
+ action='store_true')
+ parser.add_argument("-d", "--pcidb", dest="pcifile",
+ help="specify a pci database to get vendor names from",
+ default=pcifile_default, metavar="FILE")
+ parser.add_argument("-p", "--plugindir", dest="pdir",
+ help="scan dpdk for autoload plugins",
+ action='store_true')
+ parser.add_argument("elf_file", help="driver shared object file")
+ args = parser.parse_args()
+
+ if args.raw_output:
raw_output = True
- if options.pcifile:
- pcidb = PCIIds(options.pcifile)
+ if args.tblout:
+ args.pcifile = None
+
+ if args.pcifile:
+ pcidb = PCIIds(args.pcifile)
if pcidb is None:
print("Pci DB file not found")
exit(1)
- if options.tblout:
- options.pcifile = None
- pcidb = None
-
- if len(args) == 0:
- optparser.print_usage()
- exit(1)
-
- if options.pdir:
+ if args.pdir:
exit(scan_for_autoload_pmds(args[0]))
ldlibpath = os.environ.get('LD_LIBRARY_PATH')
if ldlibpath is None:
ldlibpath = ""
- if os.path.exists(args[0]):
- myelffile = args[0]
+ if os.path.exists(args.elf_file):
+ myelffile = args.elf_file
else:
- myelffile = search_file(
- args[0], ldlibpath + ":/usr/lib64:/lib64:/usr/lib:/lib")
+ myelffile = search_file(args.elf_file,
+ ldlibpath + ":/usr/lib64:/lib64:/usr/lib:/lib")
if myelffile is None:
print("File not found")
--
2.27.0
next prev parent reply other threads:[~2020-11-04 6:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-06 1:31 [dpdk-dev] [PATCH 00/11] Python script updates Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 01/11] cpu_layout: refactor to meet python standards Stephen Hemminger
2020-11-04 6:53 ` [dpdk-dev] [PATCH v2] " Stephen Hemminger
2020-11-04 9:21 ` Bruce Richardson
2020-11-04 16:22 ` Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 02/11] dpdk-pmdinfo: replace string.split with split Stephen Hemminger
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 0/7] dpdk-pmdinfo: python lint cleanups Stephen Hemminger
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 1/7] dpdk-pmdinfo: replace string.split with split Stephen Hemminger
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 2/7] dpdk-pmdinfo: replace io.open with open Stephen Hemminger
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 3/7] dpdk-pmdinfo: remove unnecessary paren and else Stephen Hemminger
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 4/7] dpdk-pmdinfo: replace is False and is True Stephen Hemminger
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 5/7] dpdk-pmdinfo: fix indentation Stephen Hemminger
2020-11-04 6:48 ` Stephen Hemminger [this message]
2020-11-24 6:35 ` [dpdk-dev] [PATCH v2 6/7] dpdk-pmdinfo: replace deprecated optparse with argparse Jiang, YuX
2020-11-04 6:48 ` [dpdk-dev] [PATCH v2 7/7] dpdk-pmdinfo: do not use len(x) to test for empty Stephen Hemminger
2020-11-22 20:54 ` [dpdk-dev] [PATCH v2 0/7] dpdk-pmdinfo: python lint cleanups Thomas Monjalon
2020-09-06 1:31 ` [dpdk-dev] [PATCH 03/11] dpdk-pmdinfo: replace io.open with open Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 04/11] dpdk-pmdinfo: remove dead code Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 05/11] dpdk-pmdinfo: remove unnecessary paren and else Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 06/11] dpdk-pmdinfo: replace is False and is True Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 07/11] dpdk-pmdinfo: fix indentation Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 08/11] dpdk-pmdinfo: replace deprecated optparse with argparse Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 09/11] dpdk-pmdinfo: do not use len(x) to test for empty Stephen Hemminger
2020-09-07 9:03 ` Bruce Richardson
2020-09-07 17:20 ` Stephen Hemminger
2020-09-06 1:31 ` [dpdk-dev] [PATCH 10/11] dpdk-telemetry-client: fix some pylint warnings Stephen Hemminger
2020-09-07 9:05 ` Bruce Richardson
2020-11-04 7:00 ` [dpdk-dev] [PATCH v2] " Stephen Hemminger
2020-11-15 23:06 ` Thomas Monjalon
2020-09-06 1:31 ` [dpdk-dev] [PATCH 11/11] dpdk-devbind: use argparse instead of getopt Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 0/6] dpdk-devbind: python lint cleanups Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 1/6] dpdk-devbind: use argparse instead of getopt Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 2/6] dpdk-devbind: fix indentation Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 3/6] dpdk-devbind: fix python lint warnings for imports Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 4/6] dpdk-devbind: do not use len(x) to test for empty Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 5/6] dpdk-devbind: fix unnecessary else after return Stephen Hemminger
2020-11-04 7:03 ` [dpdk-dev] [PATCH v2 6/6] dpdk-devbind: use in to test for multiple strings Stephen Hemminger
2020-11-04 9:28 ` [dpdk-dev] [PATCH v2 0/6] dpdk-devbind: python lint cleanups Bruce Richardson
2020-11-22 21:03 ` Thomas Monjalon
2020-11-04 16:57 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201104064842.25832-7-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=nhorman@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.