diff --git a/ipapython/install/cli.py b/ipapython/install/cli.py index ce64baa5f..a9efa74f3 100644 --- a/ipapython/install/cli.py +++ b/ipapython/install/cli.py @@ -10,6 +10,8 @@ import collections import optparse import signal +import six + from ipapython import admintool, ipa_log_manager from ipapython.ipautil import CheckedIPAddress, private_ccache @@ -17,6 +19,9 @@ from . import core, common __all__ = ['install_tool', 'uninstall_tool'] +if six.PY3: + long = int + def install_tool(configurable_class, command_name, log_file_name, positional_arguments=None, usage=None, debug_option=False, diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index 77610c6d4..2e412861e 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -63,6 +63,7 @@ from time import sleep if six.PY3: unicode = str + long = int __doc__ = _(""" Classes to manage trust joins using DCE-RPC calls diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py index 6377c0696..9e70b74a1 100644 --- a/ipaserver/install/ipa_otptoken_import.py +++ b/ipaserver/install/ipa_otptoken_import.py @@ -40,6 +40,7 @@ from ipaserver.plugins.ldap2 import ldap2 if six.PY3: unicode = str + long = int class ValidationError(Exception):