Fix a few implicit reexports

Were over 4000 warnings, now less than 1000.

Transient reexports are a major pain point when moving/splitting
modules.  Let's reduce that or, at least, make it explicit.

Change-Id: I701e747645bd7886c29b98642739b64273d8d7cb

.pylintrc

@@ -25,6 +25,9 @@ signature-mutators=cmk.utils.store.with_lock_dict
 
 [MESSAGES CONTROL]
 disable=
+ # Not useless if that's exporting a type as done often enough
+ # in the standard library.
+ useless-import-alias,
  # Use local suppressions or (even better) refactor the code.
  import-outside-toplevel,
  #---------------------------------------------------------------------------

cmk/base/check_api.py

@@ -29,9 +29,9 @@
 from cmk.utils.hostaddress import HostName
 from cmk.utils.http_proxy_config import HTTPProxyConfig
 from cmk.utils.metrics import MetricName
-from cmk.utils.regex import regex  # noqa: F401 # pylint: disable=unused-import
+from cmk.utils.regex import regex as regex  # pylint: disable=unused-import
 
-from cmk.checkengine.checkresults import state_markers
+from cmk.checkengine.checkresults import state_markers as state_markers
 from cmk.checkengine.plugin_contexts import host_name as _internal_host_name
 from cmk.checkengine.plugin_contexts import service_description
 from cmk.checkengine.submitters import ServiceDetails, ServiceState
@@ -40,10 +40,14 @@
 import cmk.base.item_state as _item_state
 import cmk.base.prediction as _prediction
 from cmk.base.api.agent_based import render as _render
-from cmk.base.api.agent_based.register.utils_legacy import ( # noqa: F401 # pylint: disable=unused-import
- LegacyCheckDefinition,
+
+# pylint: disable=unused-import
+from cmk.base.api.agent_based.register.utils_legacy import (
+ LegacyCheckDefinition as LegacyCheckDefinition,
 )
 
+# pylint: enable=unused-import
+
 Warn = Union[None, int, float]
 Crit = Union[None, int, float]
 _Bound = Union[None, int, float]

cmk/ec/export.py

@@ -6,42 +6,43 @@
 # flake8: noqa
 # pylint: disable=unused-import
 
-from .config import (
- ConfigFromWATO,
- ECRulePack,
- ECRulePackSpec,
- MatchGroups,
- MkpRulePackProxy,
- Rule,
- TextMatchResult,
- TextPattern,
-)
-from .defaults import default_config, default_rule_pack
-from .event import Event
-from .forward import SyslogForwarderUnixSocket, SyslogMessage
-from .main import SyslogFacility, SyslogPriority, TimePeriods
+from .config import ConfigFromWATO as ConfigFromWATO
+from .config import ECRulePack as ECRulePack
+from .config import ECRulePackSpec as ECRulePackSpec
+from .config import MatchGroups as MatchGroups
+from .config import MkpRulePackProxy as MkpRulePackProxy
+from .config import Rule as Rule
+from .config import TextMatchResult as TextMatchResult
+from .config import TextPattern as TextPattern
+from .defaults import default_config as default_config
+from .defaults import default_rule_pack as default_rule_pack
+from .event import Event as Event
+from .forward import SyslogForwarderUnixSocket as SyslogForwarderUnixSocket
+from .forward import SyslogMessage as SyslogMessage
+from .main import SyslogFacility as SyslogFacility
+from .main import SyslogPriority as SyslogPriority
+from .main import TimePeriods as TimePeriods
 
 # TODO remove match_ipv4_network when the GUI uses the EC logic.
-from .rule_matcher import (
- compile_rule,
- match_ip_network,
- MatchFailure,
- MatchResult,
- MatchSuccess,
- RuleMatcher,
-)
-from .rule_packs import (
- export_rule_pack,
- install_packaged_rule_packs,
- load_config,
- load_rule_packs,
- mkp_rule_pack_dir,
- override_rule_pack_proxy,
- release_packaged_rule_packs,
- remove_exported_rule_pack,
- rule_pack_dir,
- RulePackType,
- save_rule_packs,
- uninstall_packaged_rule_packs,
-)
-from .settings import FileDescriptor, PortNumber, Settings, settings
+from .rule_matcher import compile_rule as compile_rule
+from .rule_matcher import match_ip_network as match_ip_network
+from .rule_matcher import MatchFailure as MatchFailure
+from .rule_matcher import MatchResult as MatchResult
+from .rule_matcher import MatchSuccess as MatchSuccess
+from .rule_matcher import RuleMatcher as RuleMatcher
+from .rule_packs import export_rule_pack as export_rule_pack
+from .rule_packs import install_packaged_rule_packs as install_packaged_rule_packs
+from .rule_packs import load_config as load_config
+from .rule_packs import load_rule_packs as load_rule_packs
+from .rule_packs import mkp_rule_pack_dir as mkp_rule_pack_dir
+from .rule_packs import override_rule_pack_proxy as override_rule_pack_proxy
+from .rule_packs import release_packaged_rule_packs as release_packaged_rule_packs
+from .rule_packs import remove_exported_rule_pack as remove_exported_rule_pack
+from .rule_packs import rule_pack_dir as rule_pack_dir
+from .rule_packs import RulePackType as RulePackType
+from .rule_packs import save_rule_packs as save_rule_packs
+from .rule_packs import uninstall_packaged_rule_packs as uninstall_packaged_rule_packs
+from .settings import FileDescriptor as FileDescriptor
+from .settings import PortNumber as PortNumber
+from .settings import Settings as Settings
+from .settings import settings as settings

cmk/gui/fields/utils.py

@@ -28,7 +28,7 @@
 from cmk.utils.tags import BuiltinTagConfig, TagGroup, TagID
 
 from cmk.gui import site_config
-from cmk.gui.fields.base import BaseSchema
+from cmk.gui.fields.base import BaseSchema as BaseSchema
 from cmk.gui.utils.escaping import strip_tags
 from cmk.gui.watolib.host_attributes import (
  get_sorted_host_attribute_topics,