samba-tool: Removed attribute name from Command class

Removed name as it is not used anywhere
Moved all the attributes on top of the class declaration

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>

1 files changed, 12 insertions, 21 deletions

diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/source4/scripting/python/samba/netcmd/__init__.py
index f76fb8abbd..9636a3a05f 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/source4/scripting/python/samba/netcmd/__init__.py
@@ -32,24 +32,27 @@ class Option(optparse.Option):
 
 class Command(object):
     """A samba-tool command."""
-
+   
     def _get_description(self):
         return self.__doc__.splitlines()[0].rstrip("\n")
 
-    def _get_name(self):
-        name = self.__class__.__name__
-        if name.startswith("cmd_"):
-            return name[4:]
-        return name
+    description = property(_get_description)
 
-    name = property(_get_name)
+    # synopsis must be defined in all subclasses in order to provide the command usage
+    synopsis = ""
+    takes_args = []
+    takes_options = []
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "credopts": options.CredentialsOptions,
+        "versionopts": options.VersionOptions,
+        }
+    outf = sys.stdout
 
     def usage(self, *args):
         parser, _ = self._create_parser()
         parser.print_usage()
 
-    description = property(_get_description)
-
     def show_command_error(self, e):
         '''display a command error'''
         if isinstance(e, CommandError):
@@ -84,18 +87,6 @@ class Command(object):
             traceback.print_tb(etraceback)
         sys.exit(1)
 
-    outf = sys.stdout
-
-    # synopsis must be defined in all subclasses in order to provide the command usage
-    synopsis = ""
-    takes_args = []
-    takes_options = []
-    takes_optiongroups = {
-        "sambaopts": options.SambaOptions,
-        "credopts": options.CredentialsOptions,
-        "versionopts": options.VersionOptions,
-        }
-
     def _create_parser(self):
         parser = optparse.OptionParser(self.synopsis)
         parser.add_options(self.takes_options)