python: getopt: rename SambaOption to Option

 * Nothing uses SambaOption directly, everything imports it through samba.netcmd.Option
 * Avoid an unnecessary rename on import

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>

diff --git a/python/samba/getopt.py b/python/samba/getopt.py
index 96fbace0d4121faf4a4286d9f81ee5bf1d23c579..0b346b492865d803ce711ab77af29dd1acf14a2c 100644 (file)
--- a/python/samba/getopt.py
+++ b/python/samba/getopt.py
@@ -94,7 +94,7 @@ class Validator(metaclass=ABCMeta):
         pass
 
 
-class SambaOption(optparse.Option):
+class Option(optparse.Option):
     ATTRS = optparse.Option.ATTRS + ["validators"]
     TYPES = optparse.Option.TYPES + ("bytes",)
     TYPE_CHECKER = copy(optparse.Option.TYPE_CHECKER)

diff --git a/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index 7069d7081ed101d3a6eb5ad0cd612821083e2067..5360a3ed25233c930b2a7e950056a03b38969837 100644 (file)
--- a/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
@@ -26,8 +26,7 @@ import samba
 from ldb import ERR_INVALID_CREDENTIALS, LdbError
 from samba import colour
 from samba.auth import system_session
-from samba.getopt import OptionError
-from samba.getopt import SambaOption as Option
+from samba.getopt import Option, OptionError
 from samba.logger import get_samba_logger
 from samba.samdb import SamDB