Fixed class find showing --namespace option twice

and in 'instance count' moved --namespace before --sort for consistency.

Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>

docs/changes.rst

@@ -20,6 +20,9 @@ Released: not yet
 
 **Bug fixes:**
 
+* Fixed that the 'class find' command showed the --namespace option twice
+  (see issue #417)
+
 **Enhancements:**
 
 **Known issues:**
@@ -35,4 +38,3 @@ pywbemtools 0.5.0
 Released: 2019-09-29
 
 This is the initial release of pywbemtools.
-

pywbemtools/pywbemcli/_cmd_class.py

@@ -328,11 +328,6 @@ def class_associators(context, classname, **options):
 @class_group.command('find', options_metavar=CMD_OPTS_TXT)
 @click.argument('classname-glob', type=str, metavar='CLASSNAME-GLOB',
                 required=True)
-@click.option('-n', '--namespace', type=str, multiple=True,
-              required=False, metavar='NAMESPACE',
-              help='Add a namespace to the search scope. '
-                   'May be specified multiple times. '
-                   'Default: Search in all namespaces of the server.')
 @add_options(multiple_namespaces_option)
 @click.option('-s', '--sort', is_flag=True, required=False,
               help='Sort by namespace. Default is to sort by classname')

pywbemtools/pywbemcli/_cmd_instance.py

@@ -534,9 +534,9 @@ def instance_query(context, query, **options):
 @instance_group.command('count', options_metavar=CMD_OPTS_TXT)
 @click.argument('classname', type=str, metavar='CLASSNAME-GLOB',
                 required=False)
+@add_options(multiple_namespaces_option)
 @click.option('-s', '--sort', is_flag=True, required=False,
               help='Sort by instance count. Otherwise sorted by class name.')
-@add_options(multiple_namespaces_option)
 @click.pass_obj
 def instance_count(context, classname, **options):
     """