From: Rob van der Linde <rob@catalyst.net.nz>
Date: Fri, 20 Oct 2023 01:46:40 +0000 (+1300)
Subject: python: getopt: HostOptions and other option groups inherit from samba OptionGroup... 
X-Git-Tag: talloc-2.4.2~1121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b8a2de2aadd94386fb0525bfc741867121c929;p=thirdparty%2Fsamba.git

python: getopt: HostOptions and other option groups inherit from samba OptionGroup class

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Oct 25 00:31:37 UTC 2023 on atb-devel-224
---

diff --git a/python/samba/getopt.py b/python/samba/getopt.py
index fe475477ebf..0935ed00d40 100644
--- a/python/samba/getopt.py
+++ b/python/samba/getopt.py
@@ -194,7 +194,7 @@ class OptionGroup(optparse.OptionGroup):
         setattr(self, dest, arg)
 
 
-class SambaOptions(optparse.OptionGroup):
+class SambaOptions(OptionGroup):
     """General Samba-related command line options."""
 
     def __init__(self, parser):
@@ -292,23 +292,19 @@ class Samba3Options(SambaOptions):
         self._lp = s3param.get_context()
 
 
-class HostOptions(optparse.OptionGroup):
+class HostOptions(OptionGroup):
     """Command line options for connecting to target host or database."""
 
     def __init__(self, parser):
         super().__init__(parser, "Host Options")
 
-        self.H = None
         self.add_option("-H", "--URL",
                         help="LDB URL for database or target server",
                         type=str, metavar="URL", action="callback",
-                        callback=self._set_H, dest="H")
+                        callback=self.set_option, dest="H")
 
-    def _set_H(self, option, opt_str, arg, parser):
-        parser.values.H = self.H = arg
 
-
-class VersionOptions(optparse.OptionGroup):
+class VersionOptions(OptionGroup):
     """Command line option for printing Samba version."""
     def __init__(self, parser):
         super().__init__(parser, "Version Options")
@@ -346,7 +342,7 @@ def parse_kerberos_arg(arg, opt_str):
                                         (opt_str, arg))
 
 
-class CredentialsOptions(optparse.OptionGroup):
+class CredentialsOptions(OptionGroup):
     """Command line options for specifying credentials."""
 
     def __init__(self, parser, special_name=None):