Skip to contentSkip to conversation

Updates for converting optparse to argparse in

PATCH In review Anubhav Shelat 2 participants 7 messages Jun 28, 2023

lore
Share & tools
lore
#0 lore raw

cover Updates for converting optparse to argparse in

These commits can be pulled from the "argparse" branch in
https://github.com/AnubhavS1/rteval.

Anubhav Shelat (3):
rteval: added code to download default kernel version if no version is
specified
rteval: fixed comments
rteval/server: edited files to use optparse instead of argparse

 rteval-cmd                       | 12 ++++++++++--
 rteval/modules/__init__.py       |  4 ++--
 rteval/rtevalConfig.py           |  2 +-
 server/remove_rtevalrun          | 16 ++++++++--------
 server/rteval_testserver.py      |  1 -
 server/testclient_sendreportfile | 10 +++++-----
 6 files changed, 26 insertions(+), 19 deletions(-)
Signature · 1 line
2.39.3
#1 lore raw

PATCH 1/3 rteval: added code to download default kernel version if no version is specified

Previously, the usuage was "./rteval-cmd -S [KERNEL_VERSION]", and rteval-cmd would throw an error if no kernel version was provided. Now, rteval-cmd will download the default kernel version, as specified in rteval/modules/loads/kcompile.py.

---
 rteval-cmd | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
rteval-cmd +9 -1
index f715fec1e21c..ae94bd98cc11 100755
@@ -166,7 +166,7 @@ def parse_options(cfg, parser, cmdargs):
     parser.add_argument("-V", "--version", dest="rteval___version",
                       action='store_true', default=False,
                       help='print rteval version and exit')
-    parser.add_argument("-S", "--source-download", dest="rteval___srcdownload",
+    parser.add_argument("-S", "--source-download", nargs="*", dest="rteval___srcdownload",
                         type=str, default=None, metavar="KERNEL_VERSION",
                         help='download a source kernel from kernel.org and exit')
 
@@ -191,8 +191,16 @@ def parse_options(cfg, parser, cmdargs):
             ind = cmdargs.index('--raw-histogram')
         cmd_args = cmdargs[ind+1:]
         cmdargs = cmdargs[:ind+1]
+
     cmd_opts = parser.parse_args(args=cmdargs)
 
+    # if no kernel version was provided for --source-download, set version to default
+    if (sys.argv.count('-S')+sys.argv.count('--source-download')) > 0:
+        if cmd_opts.rteval___srcdownload == []:
+            cmd_opts.rteval___srcdownload = ModuleParameters()["source"]["default"].replace(".tar.xz", "")
+        else:
+            cmd_opts.rteval___srcdownload = cmd_opts.rteval___srcdownload[0]
+
     if cmd_opts.rteval___version:
         print(f"rteval version {RTEVAL_VERSION}")
         sys.exit(0)
Signature · 1 line
2.39.3
#2 lore raw

Re: [PATCH 1/3] rteval: added code to download default kernel version if no version is specified

Quoted 44 lines · Anubhav Shelat

Previously, the usuage was "./rteval-cmd -S [KERNEL_VERSION]", and rteval-cmd would throw an error if no kernel version was provided. Now, rteval-cmd will download the default kernel version, as specified in rteval/modules/loads/kcompile.py.

---
 rteval-cmd | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
rteval-cmd +9 -1
index f715fec1e21c..ae94bd98cc11 100755
@@ -166,7 +166,7 @@ def parse_options(cfg, parser, cmdargs):
     parser.add_argument("-V", "--version", dest="rteval___version",
                       action='store_true', default=False,
                       help='print rteval version and exit')
-    parser.add_argument("-S", "--source-download", dest="rteval___srcdownload",
+    parser.add_argument("-S", "--source-download", nargs="*", dest="rteval___srcdownload",
                         type=str, default=None, metavar="KERNEL_VERSION",
                         help='download a source kernel from kernel.org and exit')
 
@@ -191,8 +191,16 @@ def parse_options(cfg, parser, cmdargs):
             ind = cmdargs.index('--raw-histogram')
         cmd_args = cmdargs[ind+1:]
         cmdargs = cmdargs[:ind+1]
+
     cmd_opts = parser.parse_args(args=cmdargs)
 
+    # if no kernel version was provided for --source-download, set version to default
+    if (sys.argv.count('-S')+sys.argv.count('--source-download')) > 0:
+        if cmd_opts.rteval___srcdownload == []:
+            cmd_opts.rteval___srcdownload = ModuleParameters()["source"]["default"].replace(".tar.xz", "")
+        else:
+            cmd_opts.rteval___srcdownload = cmd_opts.rteval___srcdownload[0]
+
     if cmd_opts.rteval___version:
         print(f"rteval version {RTEVAL_VERSION}")
         sys.exit(0)
Signature · 1 line
2.39.3
#3 lore raw

PATCH 2/3 rteval: fixed comments

In reply to Anubhav Shelat

rteval-cmd: fixed typo
__init__.py, rtevalConfig: changed comments to use argparse instead of optparse

---
 rteval-cmd                 | 2 +-
 rteval/modules/__init__.py | 4 ++--
 rteval/rtevalConfig.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
rteval-cmd +1 -1
index ae94bd98cc11..1f2ea08ef4ff 100755
@@ -183,7 +183,7 @@ def parse_options(cfg, parser, cmdargs):
             ind = cmdargs.index('--summarize')
         cmd_args = cmdargs[ind+1:]
         cmdargs = cmdargs[:ind+1]
-    # if -H/--raw-histogram is specified, add the files to be summarized to cmd_args, and add -Z to cmd_opts
+    # if -H/--raw-histogram is specified, add the files to be summarized to cmd_args, and add -H to cmd_opts
     elif (sys.argv.count('-H')+sys.argv.count('--raw-histogram')) > 0:
         try:
             ind = cmdargs.index('-H')
rteval/modules/__init__.py +2 -2
index 253e72abf8aa..794135d277b5 100644
@@ -292,7 +292,7 @@ the information provided by the module"""
 
 
     def SetupModuleOptions(self, parser, config):
-        """Sets up a separate optptarse OptionGroup per module with its supported parameters"""
+        """Sets up a separate argparse ArgumentGroup per module with its supported parameters"""
 
         grparser = parser.add_argument_group("Group Options for %s modules" % self.__modtype)
         grparser.add_argument('--%s-cpulist' % self.__modtype,
@@ -451,7 +451,7 @@ class RtEvalModules:
         return self.__modules.GetModulesList()
 
     def SetupModuleOptions(self, parser):
-        "Sets up optparse based option groups for the loaded modules"
+        "Sets up argparse based argument groups for the loaded modules"
         return self.__modules.SetupModuleOptions(parser, self._cfg)
 
     def GetNamedModuleObject(self, modname):
rteval/rtevalConfig.py +1 -1
index ec14a13adcd9..d0115a052324 100644
@@ -291,7 +291,7 @@ class rtevalConfig:
 
         last_sect = None
         for sk, v in sorted(vars(cmd_opts).items()):
-            # optparse key template: {sectionname}___{key}
+            # argparse key template: {sectionname}___{key}
             k = sk.split('___')
             if k[0] != last_sect:
                 # If the section name changed, retrieve the section variables
Signature · 1 line
2.39.3
#4 lore raw

Re: [PATCH 2/3] rteval: fixed comments

Quoted 61 lines · Anubhav Shelat

rteval-cmd: fixed typo
__init__.py, rtevalConfig: changed comments to use argparse instead of optparse

---
 rteval-cmd                 | 2 +-
 rteval/modules/__init__.py | 4 ++--
 rteval/rtevalConfig.py     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
rteval-cmd +1 -1
index ae94bd98cc11..1f2ea08ef4ff 100755
@@ -183,7 +183,7 @@ def parse_options(cfg, parser, cmdargs):
             ind = cmdargs.index('--summarize')
         cmd_args = cmdargs[ind+1:]
         cmdargs = cmdargs[:ind+1]
-    # if -H/--raw-histogram is specified, add the files to be summarized to cmd_args, and add -Z to cmd_opts
+    # if -H/--raw-histogram is specified, add the files to be summarized to cmd_args, and add -H to cmd_opts
     elif (sys.argv.count('-H')+sys.argv.count('--raw-histogram')) > 0:
         try:
             ind = cmdargs.index('-H')
rteval/modules/__init__.py +2 -2
index 253e72abf8aa..794135d277b5 100644
@@ -292,7 +292,7 @@ the information provided by the module"""
 
 
     def SetupModuleOptions(self, parser, config):
-        """Sets up a separate optptarse OptionGroup per module with its supported parameters"""
+        """Sets up a separate argparse ArgumentGroup per module with its supported parameters"""
 
         grparser = parser.add_argument_group("Group Options for %s modules" % self.__modtype)
         grparser.add_argument('--%s-cpulist' % self.__modtype,
@@ -451,7 +451,7 @@ class RtEvalModules:
         return self.__modules.GetModulesList()
 
     def SetupModuleOptions(self, parser):
-        "Sets up optparse based option groups for the loaded modules"
+        "Sets up argparse based argument groups for the loaded modules"
         return self.__modules.SetupModuleOptions(parser, self._cfg)
 
     def GetNamedModuleObject(self, modname):
rteval/rtevalConfig.py +1 -1
index ec14a13adcd9..d0115a052324 100644
@@ -291,7 +291,7 @@ class rtevalConfig:
 
         last_sect = None
         for sk, v in sorted(vars(cmd_opts).items()):
-            # optparse key template: {sectionname}___{key}
+            # argparse key template: {sectionname}___{key}
             k = sk.split('___')
             if k[0] != last_sect:
                 # If the section name changed, retrieve the section variables
Signature · 1 line
2.39.3

You forgot your SOB, please resend with the SOB

#5 lore raw

PATCH 3/3 rteval/server: edited files to use optparse instead of argparse

In reply to Anubhav Shelat

rteval/server: edited files to use optparse instead of argparse.
Note: Since server is diabled, these changes have not been tested.

---
 server/remove_rtevalrun          | 16 ++++++++--------
 server/rteval_testserver.py      |  1 -
 server/testclient_sendreportfile | 10 +++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)
server/remove_rtevalrun +8 -8
index cee699e27c9f..7d83f71ea644 100755
@@ -29,7 +29,7 @@
 
 import sys
 import getpass
-from optparse import OptionParser
+from argparse import ArgumentParser
 from database import Database
 
 def do_delete(dbc, table, rterid):
@@ -45,20 +45,20 @@ def do_delete(dbc, table, rterid):
 
 
 if __name__ == '__main__':
-    parser = OptionParser(version="%prog v0.1")
+    parser = ArgumentParser(version="%prog v0.1")
 
-    parser.add_option("-H", "--host", action="store", dest="dbhost", default="localhost",
+    parser.add_argument("-H", "--host", action="store", dest="dbhost", default="localhost",
                       help="Database server to connect to (default: %default)",
                       metavar="HOST")
-    parser.add_option("-p", "--port", action="store", dest="dbport", default="5432",
+    parser.add_argument("-p", "--port", action="store", dest="dbport", default="5432",
                       help="Database server port to use (default: %default)", metavar="PORT")
-    parser.add_option("-U", "--user", action="store", dest="dbuser", default="rtevaladmin",
+    parser.add_argument("-U", "--user", action="store", dest="dbuser", default="rtevaladmin",
                       help="Database user to connect as (default: %default)", metavar="USERNAME")
-    parser.add_option("-d", "--database", action="store", dest="dbname", default="rteval",
+    parser.add_argument("-d", "--database", action="store", dest="dbname", default="rteval",
                       help="Database to use (default: %default)", metavar="DATABASE")
-    parser.add_option("-r", "--rterid", action="store", dest="rterid", default=None,
+    parser.add_argument("-r", "--rterid", action="store", dest="rterid", default=None,
                       help="rteval run id to remove from the database", metavar="INTEGER")
-    (opts, args) = parser.parse_args()
+    opts = parser.parse_args()
 
     if opts.rterid is None:
         print "%s:  Missing --rterid value" % sys.argv[0]
server/rteval_testserver.py +0 -1
index 6cac85bcfe52..c7f9ce954b21 100644
@@ -30,7 +30,6 @@ import sys
 import signal
 from xmlrpc.server import SimpleXMLRPCServer
 from xmlrpc.server import SimpleXMLRPCRequestHandler
-from optparse import OptionParser
 import argparse
 
 import xmlrpc_API1
server/testclient_sendreportfile +5 -5
index 08317b263f76..dc69a199122c 100755
@@ -28,22 +28,22 @@
 
 import sys
 import libxml2
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 sys.path.append('../rteval')
 import rtevalclient
 
 if __name__ == '__main__':
-    parser = OptionParser(version="%prog v0.1")
+    parser = ArgumentParser(version="%prog v0.1")
 
-    parser.add_option("-r", "--report", action="store", dest="report", default="summary.xml",
+    parser.add_argument("-r", "--report", action="store", dest="report", default="summary.xml",
                       help="Which XML report to send to the XML-RPC server  (default: %default)",
                       metavar="FILE")
-    parser.add_option("-X", "--xmlrpc-submit", dest="xmlrpchost", default="localhost:65432",
+    parser.add_argument("-X", "--xmlrpc-submit", dest="xmlrpchost", default="localhost:65432",
                       help="Hostname to the XML-RPC server to send the data (default: %default)",
                       metavar="HOST[:PORT]")
 
-    (opts, args) = parser.parse_args()
+    opts = parser.parse_args()
 
     d = libxml2.parseFile(opts.report)
 
Signature · 1 line
2.39.3
#6 lore raw

Re: [PATCH 3/3] rteval/server: edited files to use optparse instead of argparse

Quoted 99 lines · Anubhav Shelat

rteval/server: edited files to use optparse instead of argparse.
Note: Since server is diabled, these changes have not been tested.

---
 server/remove_rtevalrun          | 16 ++++++++--------
 server/rteval_testserver.py      |  1 -
 server/testclient_sendreportfile | 10 +++++-----
 3 files changed, 13 insertions(+), 14 deletions(-)
server/remove_rtevalrun +8 -8
index cee699e27c9f..7d83f71ea644 100755
@@ -29,7 +29,7 @@
 
 import sys
 import getpass
-from optparse import OptionParser
+from argparse import ArgumentParser
 from database import Database
 
 def do_delete(dbc, table, rterid):
@@ -45,20 +45,20 @@ def do_delete(dbc, table, rterid):
 
 
 if __name__ == '__main__':
-    parser = OptionParser(version="%prog v0.1")
+    parser = ArgumentParser(version="%prog v0.1")
 
-    parser.add_option("-H", "--host", action="store", dest="dbhost", default="localhost",
+    parser.add_argument("-H", "--host", action="store", dest="dbhost", default="localhost",
                       help="Database server to connect to (default: %default)",
                       metavar="HOST")
-    parser.add_option("-p", "--port", action="store", dest="dbport", default="5432",
+    parser.add_argument("-p", "--port", action="store", dest="dbport", default="5432",
                       help="Database server port to use (default: %default)", metavar="PORT")
-    parser.add_option("-U", "--user", action="store", dest="dbuser", default="rtevaladmin",
+    parser.add_argument("-U", "--user", action="store", dest="dbuser", default="rtevaladmin",
                       help="Database user to connect as (default: %default)", metavar="USERNAME")
-    parser.add_option("-d", "--database", action="store", dest="dbname", default="rteval",
+    parser.add_argument("-d", "--database", action="store", dest="dbname", default="rteval",
                       help="Database to use (default: %default)", metavar="DATABASE")
-    parser.add_option("-r", "--rterid", action="store", dest="rterid", default=None,
+    parser.add_argument("-r", "--rterid", action="store", dest="rterid", default=None,
                       help="rteval run id to remove from the database", metavar="INTEGER")
-    (opts, args) = parser.parse_args()
+    opts = parser.parse_args()
 
     if opts.rterid is None:
         print "%s:  Missing --rterid value" % sys.argv[0]
server/rteval_testserver.py +0 -1
index 6cac85bcfe52..c7f9ce954b21 100644
@@ -30,7 +30,6 @@ import sys
 import signal
 from xmlrpc.server import SimpleXMLRPCServer
 from xmlrpc.server import SimpleXMLRPCRequestHandler
-from optparse import OptionParser
 import argparse
 
 import xmlrpc_API1
server/testclient_sendreportfile +5 -5
index 08317b263f76..dc69a199122c 100755
@@ -28,22 +28,22 @@
 
 import sys
 import libxml2
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 sys.path.append('../rteval')
 import rtevalclient
 
 if __name__ == '__main__':
-    parser = OptionParser(version="%prog v0.1")
+    parser = ArgumentParser(version="%prog v0.1")
 
-    parser.add_option("-r", "--report", action="store", dest="report", default="summary.xml",
+    parser.add_argument("-r", "--report", action="store", dest="report", default="summary.xml",
                       help="Which XML report to send to the XML-RPC server  (default: %default)",
                       metavar="FILE")
-    parser.add_option("-X", "--xmlrpc-submit", dest="xmlrpchost", default="localhost:65432",
+    parser.add_argument("-X", "--xmlrpc-submit", dest="xmlrpchost", default="localhost:65432",
                       help="Hostname to the XML-RPC server to send the data (default: %default)",
                       metavar="HOST[:PORT]")
 
-    (opts, args) = parser.parse_args()
+    opts = parser.parse_args()
 
     d = libxml2.parseFile(opts.report)
 
Signature · 1 line
2.39.3

- Fixed spelling in commit comments