Merge 37f3b8b into 3bac9a8

pywbem · Aug 10, 2020 · b03ad8b · b03ad8b
2 parents 3bac9a8 + 37f3b8b
commit b03ad8b
Show file tree

Hide file tree

Showing 9 changed files with 1,191 additions and 1,072 deletions.
diff --git a/docs/changes.rst b/docs/changes.rst
@@ -75,6 +75,9 @@ Released: not yet
   --connections-file general option in various places, for consistency.
   (Related to issue #708)
 
+* Move code associated with display_cimobjects() to a separate module. This
+  is part of creating table representation of classes (See issue #249)
+
 **Known issues:**
 
 * See `list of open issues`_.

diff --git a/pywbemtools/pywbemcli/__init__.py b/pywbemtools/pywbemcli/__init__.py
@@ -39,6 +39,7 @@
 from ._association_shrub import *   # noqa: F403,F401
 from ._utils import *               # noqa: F403,F401
 from ._cimvalueformatter import *   # noqa: F403,F401
+from ._display_cimobjects import *   # noqa: F403,F401
 
 
 from .._version import __version__  # noqa: F401
diff --git a/pywbemtools/pywbemcli/_cmd_class.py b/pywbemtools/pywbemcli/_cmd_class.py
@@ -29,10 +29,13 @@
     CIM_ERR_NOT_FOUND, CIMClass
 
 from .pywbemcli import cli
-from ._common import display_cim_objects, filter_namelist, \
+from ._common import filter_namelist, \
     resolve_propertylist, CMD_OPTS_TXT, GENERAL_OPTS_TXT, SUBCMD_HELP_TXT, \
     output_format_is_table, format_table, process_invokemethod, \
     raise_pywbem_error_exception, warning_msg, validate_output_format
+
+from ._display_cimobjects import display_cim_objects
+
 from ._common_options import add_options, propertylist_option, \
     names_only_option, include_classorigin_class_option, namespace_option,  \
     summary_option, multiple_namespaces_option, class_filter_options, \
@@ -708,6 +711,7 @@ def cmd_class_get(context, classname, options):
     the class. If the class cannot be found, the server returns a CIMError
     exception.
     """
+
     format_group = get_format_group(context, options)
     output_format = validate_output_format(context.output_format, format_group)
 

diff --git a/pywbemtools/pywbemcli/_cmd_instance.py b/pywbemtools/pywbemcli/_cmd_instance.py
@@ -28,13 +28,14 @@
     CIM_ERR_NOT_FOUND
 
 from .pywbemcli import cli
-from ._common import display_cim_objects, \
-    pick_instance, resolve_propertylist, create_ciminstance, \
+from ._common import pick_instance, resolve_propertylist, create_ciminstance, \
     filter_namelist, format_table, verify_operation, \
     process_invokemethod, raise_pywbem_error_exception, \
     parse_kv_pair, warning_msg, validate_output_format, \
     CMD_OPTS_TXT, GENERAL_OPTS_TXT, SUBCMD_HELP_TXT
 
+from ._display_cimobjects import display_cim_objects
+
 from ._common_options import add_options, propertylist_option, \
     names_only_option, include_classorigin_instance_option, namespace_option, \
     summary_option, verify_option, multiple_namespaces_option, \

diff --git a/pywbemtools/pywbemcli/_cmd_qualifier.py b/pywbemtools/pywbemcli/_cmd_qualifier.py
@@ -27,9 +27,10 @@
 from pywbem import Error
 
 from .pywbemcli import cli
-from ._common import display_cim_objects, sort_cimobjects, \
+from ._common import sort_cimobjects, \
     raise_pywbem_error_exception, validate_output_format, \
     CMD_OPTS_TXT, GENERAL_OPTS_TXT, SUBCMD_HELP_TXT
+from ._display_cimobjects import display_cim_objects
 from ._common_options import add_options, namespace_option, summary_option, \
     help_option
 from ._click_extensions import PywbemcliGroup, PywbemcliCommand