Skip to content
Snippets Groups Projects
Unverified Commit cbff802d authored by Rafael Guterres Jeffman's avatar Rafael Guterres Jeffman Committed by GitHub
Browse files

Merge pull request #1226 from t-woerner/ipalib.install.kinit_moved_to_ipalib_freeipa_7286

ipalib.install.kinit moved to ipalib
parents 4ceb6aa0 35614d7a
Branches
Tags
No related merge requests found
...@@ -86,9 +86,13 @@ try: ...@@ -86,9 +86,13 @@ try:
from ipalib.config import Env from ipalib.config import Env
from ipalib.constants import DEFAULT_CONFIG, LDAP_GENERALIZED_TIME_FORMAT from ipalib.constants import DEFAULT_CONFIG, LDAP_GENERALIZED_TIME_FORMAT
try:
from ipalib.kinit import kinit_password, kinit_keytab
except ImportError:
try: try:
from ipalib.install.kinit import kinit_password, kinit_keytab from ipalib.install.kinit import kinit_password, kinit_keytab
except ImportError: except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_password, kinit_keytab from ipapython.ipautil import kinit_password, kinit_keytab
from ipapython.ipautil import run from ipapython.ipautil import run
from ipapython.ipautil import template_str from ipapython.ipautil import template_str
......
...@@ -88,9 +88,13 @@ try: ...@@ -88,9 +88,13 @@ try:
from ipaplatform.paths import paths from ipaplatform.paths import paths
from ipapython.ipautil import run from ipapython.ipautil import run
from ipalib.constants import DEFAULT_CONFIG from ipalib.constants import DEFAULT_CONFIG
try:
from ipalib.kinit import kinit_password, kinit_keytab
except ImportError:
try: try:
from ipalib.install.kinit import kinit_password, kinit_keytab from ipalib.install.kinit import kinit_password, kinit_keytab
except ImportError: except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_password, kinit_keytab from ipapython.ipautil import kinit_password, kinit_keytab
except ImportError as _err: except ImportError as _err:
MODULE_IMPORT_ERROR = str(_err) MODULE_IMPORT_ERROR = str(_err)
......
...@@ -172,9 +172,13 @@ try: ...@@ -172,9 +172,13 @@ try:
from ipapython.ipautil import CalledProcessError, write_tmp_file, \ from ipapython.ipautil import CalledProcessError, write_tmp_file, \
ipa_generate_password ipa_generate_password
from ipapython.dn import DN from ipapython.dn import DN
try:
from ipalib.kinit import kinit_password, kinit_keytab
except ImportError:
try: try:
from ipalib.install.kinit import kinit_keytab, kinit_password from ipalib.install.kinit import kinit_keytab, kinit_password
except ImportError: except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_keytab, kinit_password from ipapython.ipautil import kinit_keytab, kinit_password
from ipapython.ipa_log_manager import standard_logging_setup from ipapython.ipa_log_manager import standard_logging_setup
from gssapi.exceptions import GSSError from gssapi.exceptions import GSSError
......
...@@ -104,6 +104,9 @@ try: ...@@ -104,6 +104,9 @@ try:
from ipaclient.install.ipachangeconf import IPAChangeConf from ipaclient.install.ipachangeconf import IPAChangeConf
from ipalib.install import certstore, sysrestore from ipalib.install import certstore, sysrestore
from ipapython.ipautil import ipa_generate_password from ipapython.ipautil import ipa_generate_password
try:
from ipalib.kinit import kinit_keytab
except ImportError:
from ipalib.install.kinit import kinit_keytab from ipalib.install.kinit import kinit_keytab
from ipapython import ipaldap, ipautil, kernel_keyring from ipapython import ipaldap, ipautil, kernel_keyring
from ipapython.certdb import IPA_CA_TRUST_FLAGS, \ from ipapython.certdb import IPA_CA_TRUST_FLAGS, \
......
...@@ -76,9 +76,13 @@ try: ...@@ -76,9 +76,13 @@ try:
from ipaplatform.paths import paths from ipaplatform.paths import paths
from ipapython.ipautil import run from ipapython.ipautil import run
from ipalib.constants import DEFAULT_CONFIG from ipalib.constants import DEFAULT_CONFIG
try:
from ipalib.kinit import kinit_password
except ImportError:
try: try:
from ipalib.install.kinit import kinit_password from ipalib.install.kinit import kinit_password
except ImportError: except ImportError:
# pre 4.5.0
from ipapython.ipautil import kinit_password from ipapython.ipautil import kinit_password
except ImportError as _err: except ImportError as _err:
MODULE_IMPORT_ERROR = str(_err) MODULE_IMPORT_ERROR = str(_err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment