diff options
Diffstat (limited to 'ipalib/plugins')
28 files changed, 123 insertions, 0 deletions
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py index 5aa486db8..8fe382f38 100644 --- a/ipalib/plugins/aci.py +++ b/ipalib/plugins/aci.py @@ -119,6 +119,8 @@ targetattr REPLACES the current attributes, it does not add to them. """ from copy import deepcopy +import six + from ipalib import api, crud, errors from ipalib import Object from ipalib import Flag, Str, StrEnum, DNParam @@ -130,6 +132,9 @@ from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value from ipapython.ipa_log_manager import * from ipapython.dn import DN +if six.PY3: + unicode = str + register = Registry() ACI_NAME_PREFIX_SEP = ":" diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py index 0c2a246e1..a45fab07b 100644 --- a/ipalib/plugins/automember.py +++ b/ipalib/plugins/automember.py @@ -20,6 +20,7 @@ import uuid import time import ldap as _ldap +import six from ipalib import api, errors, Str, StrEnum, DNParam, _, ngettext from ipalib.plugable import Registry @@ -27,6 +28,9 @@ from ipalib.plugins.baseldap import * from ipalib.request import context from ipapython.dn import DN +if six.PY3: + unicode = str + __doc__ = _(""" Auto Membership Rule. """) + _(""" diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py index 304bed71f..a909f6c39 100644 --- a/ipalib/plugins/automount.py +++ b/ipalib/plugins/automount.py @@ -20,6 +20,8 @@ import os +import six + from ipalib import api, errors from ipalib import Object, Command from ipalib import Flag, Str, IA5Str @@ -27,6 +29,9 @@ from ipalib.plugable import Registry from ipalib.plugins.baseldap import * from ipalib import _, ngettext +if six.PY3: + unicode = str + __doc__ = _(""" Automount diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 8a375afba..81fae1516 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -38,6 +38,9 @@ from ipalib.capabilities import client_has_capability from ipapython.dn import DN, RDN from ipapython.version import API_VERSION +if six.PY3: + unicode = str + DNA_MAGIC = -1 global_output_params = ( diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py index ed7c1a9d3..b974e3fb1 100644 --- a/ipalib/plugins/baseuser.py +++ b/ipalib/plugins/baseuser.py @@ -41,6 +41,9 @@ from ipalib.capabilities import client_has_capability from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, convert_sshpubkey_post) +if six.PY3: + unicode = str + __doc__ = _(""" Baseuser diff --git a/ipalib/plugins/batch.py b/ipalib/plugins/batch.py index ddf24839d..7a4cda2a0 100644 --- a/ipalib/plugins/batch.py +++ b/ipalib/plugins/batch.py @@ -45,6 +45,8 @@ And then a nested response for each IPA command method sent in the request """ +import six + from ipalib import api, errors from ipalib import Command from ipalib.parameters import Str, Any @@ -55,6 +57,9 @@ from ipalib.request import context from ipalib.plugable import Registry from ipapython.version import API_VERSION +if six.PY3: + unicode = str + register = Registry() @register() diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 1fd5fb67f..e4593200e 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -40,10 +40,15 @@ from ipalib.text import _ from ipalib.request import context from ipalib import output from ipalib.plugins.service import validate_principal + +import six import nss.nss as nss from nss.error import NSPRError from pyasn1.error import PyAsn1Error +if six.PY3: + unicode = str + __doc__ = _(""" IPA certificate operations diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index be0639b6a..84086f4c7 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -56,6 +56,9 @@ from ipalib.util import (normalize_zonemgr, from ipapython.ipautil import CheckedIPAddress, is_host_resolvable from ipapython.dnsutil import DNSName +if six.PY3: + unicode = str + __doc__ = _(""" Domain Name System (DNS) """) + _(""" diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py index 8ee20a9a8..64a135e01 100644 --- a/ipalib/plugins/group.py +++ b/ipalib/plugins/group.py @@ -28,6 +28,9 @@ from ipalib.plugins.idviews import remove_ipaobject_overrides from ipalib.plugins import baseldap from ipalib import _, ngettext +if six.PY3: + unicode = str + if api.env.in_server and api.env.context in ['lite', 'server']: try: import ipaserver.dcerpc diff --git a/ipalib/plugins/hbactest.py b/ipalib/plugins/hbactest.py index c8dedd367..b528707f7 100644 --- a/ipalib/plugins/hbactest.py +++ b/ipalib/plugins/hbactest.py @@ -32,6 +32,10 @@ if api.env.in_server and api.env.context in ['lite', 'server']: _dcerpc_bindings_installed = False import pyhbac +import six + +if six.PY3: + unicode = str __doc__ = _(""" Simulate use of Host-based access controls diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 532ff6660..bceab314b 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -21,6 +21,8 @@ from nss.error import NSPRError import string +import six + from ipalib import api, errors, util from ipalib import Str, Flag, Bytes from ipalib.plugable import Registry @@ -49,6 +51,9 @@ from ipapython.ssh import SSHPublicKey from ipapython.dn import DN from functools import reduce +if six.PY3: + unicode = str + __doc__ = _(""" Hosts/Machines diff --git a/ipalib/plugins/hostgroup.py b/ipalib/plugins/hostgroup.py index 30d474d80..596290fcd 100644 --- a/ipalib/plugins/hostgroup.py +++ b/ipalib/plugins/hostgroup.py @@ -18,6 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six + from ipalib.plugable import Registry from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPRetrieve, LDAPDelete, LDAPUpdate, LDAPSearch, @@ -27,6 +29,9 @@ from ipalib import Str, api, _, ngettext, errors from ipalib.plugins.netgroup import NETGROUP_PATTERN, NETGROUP_PATTERN_ERRMSG from ipapython.dn import DN +if six.PY3: + unicode = str + __doc__ = _(""" Groups of hosts. diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py index 2cec05bd8..bec07da2e 100644 --- a/ipalib/plugins/idrange.py +++ b/ipalib/plugins/idrange.py @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six + from ipalib.plugable import Registry from ipalib.plugins.baseldap import (LDAPObject, LDAPCreate, LDAPDelete, LDAPRetrieve, LDAPSearch, LDAPUpdate) @@ -24,6 +26,9 @@ from ipalib import api, Int, Str, DeprecatedParam, StrEnum, _, ngettext from ipalib import errors from ipapython.dn import DN +if six.PY3: + unicode = str + if api.env.in_server and api.env.context in ['lite', 'server']: try: import ipaserver.dcerpc diff --git a/ipalib/plugins/idviews.py b/ipalib/plugins/idviews.py index cf5c9b5e8..a910486cd 100644 --- a/ipalib/plugins/idviews.py +++ b/ipalib/plugins/idviews.py @@ -19,6 +19,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import re +import six + from ipalib.plugins.baseldap import (LDAPQuery, LDAPObject, LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve, global_output_params) @@ -31,6 +33,9 @@ from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, from ipapython.dn import DN +if six.PY3: + unicode = str + _dcerpc_bindings_installed = False if api.env.in_server and api.env.context in ['lite', 'server']: diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 3d8d565e0..3e3c0fe19 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -21,6 +21,8 @@ import re from ldap import MOD_ADD from ldap import SCOPE_BASE, SCOPE_ONELEVEL, SCOPE_SUBTREE +import six + from ipalib import api, errors, output from ipalib import Command, Password, Str, Flag, StrEnum, DNParam, File, Bool from ipalib.cli import to_cli @@ -37,6 +39,9 @@ from ipapython.ipautil import write_tmp_file import datetime from ipaplatform.paths import paths +if six.PY3: + unicode = str + __doc__ = _(""" Migration to IPA diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py index e69aaf94a..fe85889de 100644 --- a/ipalib/plugins/netgroup.py +++ b/ipalib/plugins/netgroup.py @@ -18,6 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six from ipalib import api, errors from ipalib import Str, StrEnum @@ -26,6 +27,9 @@ from ipalib.plugins.baseldap import * from ipalib import _, ngettext from ipalib.plugins.hbacrule import is_all +if six.PY3: + unicode = str + __doc__ = _(""" Netgroups diff --git a/ipalib/plugins/otptoken.py b/ipalib/plugins/otptoken.py index bb027eea0..651a3ab94 100644 --- a/ipalib/plugins/otptoken.py +++ b/ipalib/plugins/otptoken.py @@ -38,6 +38,11 @@ import urlparse import qrcode import os +import six + +if six.PY3: + unicode = str + __doc__ = _(""" OTP Tokens """) + _(""" diff --git a/ipalib/plugins/otptoken_yubikey.py b/ipalib/plugins/otptoken_yubikey.py index 58fc18308..0cbda1b2e 100644 --- a/ipalib/plugins/otptoken_yubikey.py +++ b/ipalib/plugins/otptoken_yubikey.py @@ -27,6 +27,10 @@ import os import usb.core import yubico +import six + +if six.PY3: + unicode = str __doc__ = _(""" YubiKey Tokens diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index 7a2e14c72..b17b61e69 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -33,6 +33,9 @@ from ipalib.aci import ACI from ipapython.dn import DN from ipalib.request import context +if six.PY3: + unicode = str + __doc__ = _(""" Permissions """) + _(""" diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py index 866d57475..5e98d5469 100644 --- a/ipalib/plugins/pwpolicy.py +++ b/ipalib/plugins/pwpolicy.py @@ -28,6 +28,11 @@ from ipapython.ipautil import run from ipapython.dn import DN from distutils import version +import six + +if six.PY3: + unicode = str + __doc__ = _(""" Password policy diff --git a/ipalib/plugins/realmdomains.py b/ipalib/plugins/realmdomains.py index 871ea79c4..f8f838d0e 100644 --- a/ipalib/plugins/realmdomains.py +++ b/ipalib/plugins/realmdomains.py @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six + from ipalib import api, errors from ipalib import Str, Flag from ipalib import _ @@ -26,6 +28,8 @@ from ipalib.util import has_soa_or_ns_record, validate_domain_name from ipapython.dn import DN from ipapython.ipautil import get_domain_name +if six.PY3: + unicode = str __doc__ = _(""" Realm domains diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index 39285dd5d..d63e00bea 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -22,6 +22,7 @@ import base64 import os +import six from ipalib import api, errors, util from ipalib import Str, Flag, Bytes, StrEnum, Bool @@ -34,6 +35,9 @@ import nss.nss as nss from nss.error import NSPRError from ipapython.ipautil import file_exists +if six.PY3: + unicode = str + __doc__ = _(""" Services diff --git a/ipalib/plugins/servicedelegation.py b/ipalib/plugins/servicedelegation.py index 37de91638..2ce11191b 100644 --- a/ipalib/plugins/servicedelegation.py +++ b/ipalib/plugins/servicedelegation.py @@ -2,6 +2,8 @@ # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # +import six + from ipalib import api from ipalib import Str from ipalib.plugable import Registry @@ -9,6 +11,9 @@ from ipalib.plugins.baseldap import * from ipalib.plugins.service import normalize_principal from ipalib import _, ngettext +if six.PY3: + unicode = str + __doc__ = _(""" Service Constrained Delegation diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py index 2a232d1e3..00fba1f83 100644 --- a/ipalib/plugins/stageuser.py +++ b/ipalib/plugins/stageuser.py @@ -22,6 +22,9 @@ import string import posixpath import os from copy import deepcopy + +import six + from ipalib import api, errors from ipalib import (Flag, Int, Password, Str, Bool, StrEnum, DateTime, DeprecatedParam) @@ -44,6 +47,9 @@ from ipalib.capabilities import client_has_capability from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, convert_sshpubkey_post) +if six.PY3: + unicode = str + __doc__ = _(""" Stageusers diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py index 6844343e1..c799a3166 100644 --- a/ipalib/plugins/sudorule.py +++ b/ipalib/plugins/sudorule.py @@ -18,6 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import netaddr +import six from ipalib import api, errors from ipalib import Str, StrEnum, Bool, Int @@ -35,6 +36,9 @@ from ipalib import _, ngettext from ipalib.util import validate_hostmask from ipapython.dn import DN +if six.PY3: + unicode = str + __doc__ = _(""" Sudo Rules """) + _(""" diff --git a/ipalib/plugins/topology.py b/ipalib/plugins/topology.py index 2723ce121..c6b86b590 100644 --- a/ipalib/plugins/topology.py +++ b/ipalib/plugins/topology.py @@ -2,6 +2,8 @@ # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # +import six + from ipalib import api, errors from ipalib import Int, Str, Bool, StrEnum, Flag from ipalib.plugable import Registry @@ -13,6 +15,8 @@ from ipalib import output from ipalib.util import create_topology_graph, get_topology_connection_errors from ipapython.dn import DN +if six.PY3: + unicode = str __doc__ = _(""" Topology diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py index febe16f1d..472f3534e 100644 --- a/ipalib/plugins/trust.py +++ b/ipalib/plugins/trust.py @@ -18,6 +18,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +import six + from ipalib.plugable import Registry from ipalib.plugins.baseldap import * from ipalib.plugins.dns import dns_container_exists @@ -29,6 +31,9 @@ from ipalib import errors from ldap import SCOPE_SUBTREE from time import sleep +if six.PY3: + unicode = str + try: import pysss_murmur #pylint: disable=F0401 _murmur_installed = True diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index a1e7c8ce7..e7f128a33 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -23,6 +23,8 @@ import string import posixpath import os +import six + from ipalib import api, errors, util from ipalib import Flag, Int, Password, Str, Bool, StrEnum, DateTime from ipalib.plugins.baseuser import baseuser, baseuser_add, baseuser_del, \ @@ -48,6 +50,9 @@ from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, if api.env.in_server: from ipaserver.plugins.ldap2 import ldap2 +if six.PY3: + unicode = str + __doc__ = _(""" Users |