From 5f5eb1b00385fe1643dd5496c61954768fee3818 Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Mon, 18 Jul 2011 17:46:02 -0400 Subject: samba-tool: removed synopsis code in base class As it is not always possible to determine the usage of a command solely based on the list of required and optional args, it is best to have the subclasses always define it, rather than displaying an incorrect usage statement. Currently, all commands are subclassing the synopsis. Signed-off-by: Andrew Tridgell --- source4/scripting/python/samba/netcmd/__init__.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py index e7ec1f7836..2de679d6f7 100644 --- a/source4/scripting/python/samba/netcmd/__init__.py +++ b/source4/scripting/python/samba/netcmd/__init__.py @@ -50,12 +50,6 @@ class Command(object): description = property(_get_description) - def _get_synopsis(self): - ret = self.name - if self.takes_args: - ret += " " + " ".join([x.upper() for x in self.takes_args]) - return ret - def show_command_error(self, e): '''display a command error''' if isinstance(e, CommandError): @@ -89,10 +83,10 @@ class Command(object): if force_traceback or samba.get_debug_level() >= 3: traceback.print_tb(etraceback) - synopsis = property(_get_synopsis) - outf = sys.stdout + # synopsis must be defined in all subclasses in order to provide the command usage + synopsis = "" takes_args = [] takes_options = [] takes_optiongroups = { -- cgit