diff --git a/ipaplatform/debian/constants.py b/ipaplatform/debian/constants.py index 52a6681ad..7216694ad 100644 --- a/ipaplatform/debian/constants.py +++ b/ipaplatform/debian/constants.py @@ -12,6 +12,9 @@ from __future__ import absolute_import from ipaplatform.base.constants import BaseConstantsNamespace, User, Group +__all__ = ("constants", "User", "Group") + + class DebianConstantsNamespace(BaseConstantsNamespace): HTTPD_USER = User("www-data") HTTPD_GROUP = Group("www-data") diff --git a/ipaplatform/fedora/constants.py b/ipaplatform/fedora/constants.py index 34ba0ce19..896e6f607 100644 --- a/ipaplatform/fedora/constants.py +++ b/ipaplatform/fedora/constants.py @@ -9,7 +9,9 @@ This Fedora base platform module exports platform related constants. # Fallback to default constant definitions from __future__ import absolute_import -from ipaplatform.redhat.constants import RedHatConstantsNamespace +from ipaplatform.redhat.constants import ( + RedHatConstantsNamespace, User, Group +) from ipaplatform.osinfo import osinfo # Fedora 28 and earlier use /etc/sysconfig/nfs @@ -18,6 +20,9 @@ from ipaplatform.osinfo import osinfo HAS_NFS_CONF = osinfo.version_number >= (30,) +__all__ = ("constants", "User", "Group") + + class FedoraConstantsNamespace(RedHatConstantsNamespace): # Fedora allows installation of Python 2 and 3 mod_wsgi, but the modules # can't coexist. For Apache to load correct module. diff --git a/ipaplatform/redhat/constants.py b/ipaplatform/redhat/constants.py index da121e364..689f15836 100644 --- a/ipaplatform/redhat/constants.py +++ b/ipaplatform/redhat/constants.py @@ -10,7 +10,10 @@ related constants for the Red Hat OS family-based systems. # Fallback to default path definitions from __future__ import absolute_import -from ipaplatform.base.constants import BaseConstantsNamespace +from ipaplatform.base.constants import BaseConstantsNamespace, User, Group + + +__all__ = ("constants", "User", "Group") class RedHatConstantsNamespace(BaseConstantsNamespace): diff --git a/ipaplatform/rhel/constants.py b/ipaplatform/rhel/constants.py index 073e33281..58990b79a 100644 --- a/ipaplatform/rhel/constants.py +++ b/ipaplatform/rhel/constants.py @@ -9,7 +9,9 @@ This RHEL base platform module exports platform related constants. # Fallback to default constant definitions from __future__ import absolute_import -from ipaplatform.redhat.constants import RedHatConstantsNamespace +from ipaplatform.redhat.constants import ( + RedHatConstantsNamespace, User, Group +) from ipaplatform.osinfo import osinfo # RHEL 7 and earlier use /etc/sysconfig/nfs @@ -17,6 +19,9 @@ from ipaplatform.osinfo import osinfo HAS_NFS_CONF = osinfo.version_number >= (8,) +__all__ = ("constants", "User", "Group") + + class RHELConstantsNamespace(RedHatConstantsNamespace): IPA_ADTRUST_PACKAGE_NAME = "ipa-server-trust-ad" IPA_DNS_PACKAGE_NAME = "ipa-server-dns" diff --git a/ipaplatform/rhel_container/constants.py b/ipaplatform/rhel_container/constants.py index 7cf5cb3a9..6f7a90e5d 100644 --- a/ipaplatform/rhel_container/constants.py +++ b/ipaplatform/rhel_container/constants.py @@ -3,7 +3,10 @@ # """RHEL container constants """ -from ipaplatform.rhel.constants import RHELConstantsNamespace +from ipaplatform.rhel.constants import RHELConstantsNamespace, User, Group + + +__all__ = ("constants", "User", "Group") class RHELContainerConstantsNamespace(RHELConstantsNamespace): diff --git a/ipaplatform/suse/constants.py b/ipaplatform/suse/constants.py index 647942807..8922ed223 100644 --- a/ipaplatform/suse/constants.py +++ b/ipaplatform/suse/constants.py @@ -11,6 +11,9 @@ related constants for the SUSE OS family-based systems. from ipaplatform.base.constants import BaseConstantsNamespace, User, Group +__all__ = ("constants", "User", "Group") + + class SuseConstantsNamespace(BaseConstantsNamespace): HTTPD_USER = User("wwwrun") HTTPD_GROUP = Group("www") diff --git a/pylint_plugins.py b/pylint_plugins.py index 579979db6..82096055f 100644 --- a/pylint_plugins.py +++ b/pylint_plugins.py @@ -239,8 +239,8 @@ MANAGER.register_transform(scoped_nodes.ClassDef, fix_ipa_classes) def ipaplatform_constants_transform(): return AstroidBuilder(MANAGER).string_build(textwrap.dedent(''' - from ipaplatform.base.constants import constants - __all__ = ('constants',) + from ipaplatform.base.constants import constants, User, Group + __all__ = ('constants', 'User', 'Group') '''))