diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-01-03 15:16:26 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-01-05 09:50:28 +0100 |
| commit | 987d24f784e05e911bf4e87bd1156abb1dd56210 (patch) | |
| tree | 6892ea5a85a63f6089caf5b6a00241ba07ce8339 | |
| parent | 25a6ddcce8e7b9effaf19431c421dc5b3497fa22 (diff) | |
| download | freeipa-987d24f784e05e911bf4e87bd1156abb1dd56210.tar.gz freeipa-987d24f784e05e911bf4e87bd1156abb1dd56210.tar.xz freeipa-987d24f784e05e911bf4e87bd1156abb1dd56210.zip | |
Silence pylint import errors of ipaserver in ipalib and ipaclient
In client-only installations the ipaserver package is not available.
Additional guards prevent pylint to complain about missing ipaserver
package.
https://fedorahosted.org/freeipa/ticket/6468
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | ipaclient/remote_plugins/__init__.py | 2 | ||||
| -rw-r--r-- | ipalib/__init__.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ipaclient/remote_plugins/__init__.py b/ipaclient/remote_plugins/__init__.py index 9cf501f71..50cfc37dc 100644 --- a/ipaclient/remote_plugins/__init__.py +++ b/ipaclient/remote_plugins/__init__.py @@ -103,7 +103,7 @@ class ServerInfo(collections.MutableMapping): def get_package(api): if api.env.in_tree: - from ipaserver import plugins + from ipaserver import plugins # pylint: disable=import-error else: try: plugins = api._remote_plugins diff --git a/ipalib/__init__.py b/ipalib/__init__.py index 4a61aced2..aaca97363 100644 --- a/ipalib/__init__.py +++ b/ipalib/__init__.py @@ -908,7 +908,7 @@ class API(plugable.API): @property def packages(self): if self.env.in_server: - import ipaserver.plugins + import ipaserver.plugins # pylint: disable=import-error result = ( ipaserver.plugins, ) @@ -921,7 +921,7 @@ class API(plugable.API): ) if self.env.context in ('installer', 'updates'): - import ipaserver.install.plugins + import ipaserver.install.plugins # pylint: disable=import-error result += (ipaserver.install.plugins,) return result |