diff options
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/frontend.py | 1 | ||||
-rw-r--r-- | ipalib/parameters.py | 1 | ||||
-rw-r--r-- | ipalib/util.py | 47 |
3 files changed, 0 insertions, 49 deletions
diff --git a/ipalib/frontend.py b/ipalib/frontend.py index b31d6d4b8..e8a84eabe 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -26,7 +26,6 @@ import inspect from base import lock, check_name, NameSpace from plugable import Plugin, is_production_mode from parameters import create_param, parse_param_spec, Param, Str, Flag, Password -from util import make_repr from output import Output, Entry, ListOfEntries from text import _, ngettext diff --git a/ipalib/parameters.py b/ipalib/parameters.py index e9951a1c8..83a86544d 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -106,7 +106,6 @@ import csv from xmlrpclib import MAXINT, MININT from types import NoneType -from util import make_repr from text import _ as ugettext from plugable import ReadOnly, lock, check_name from errors import ConversionError, RequirementError, ValidationError diff --git a/ipalib/util.py b/ipalib/util.py index 6fa69e7af..64ac6b2cf 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -61,16 +61,6 @@ def get_current_principal(): #TODO: do a kinit? raise errors.CCacheError() -def get_fqdn(): - fqdn = "" - try: - fqdn = socket.getfqdn() - except: - try: - fqdn = socket.gethostname() - except: - fqdn = "" - return fqdn # FIXME: This function has no unit test def find_modules_in_dir(src_dir): @@ -94,43 +84,6 @@ def find_modules_in_dir(src_dir): yield (module, pyfile) -# FIXME: This function has no unit test -def load_plugins_in_dir(src_dir): - """ - Import each Python module found in ``src_dir``. - """ - for module in find_modules_in_dir(src_dir): - imp.load_module(module, *imp.find_module(module, [src_dir])) - - -# FIXME: This function has no unit test -def import_plugins_subpackage(name): - """ - Import everythig in ``plugins`` sub-package of package named ``name``. - """ - try: - plugins = __import__(name + '.plugins').plugins - except ImportError: - return - src_dir = os.path.dirname(os.path.abspath(plugins.__file__)) - for name in find_modules_in_dir(src_dir): - full_name = '%s.%s' % (plugins.__name__, name) - __import__(full_name) - - -def make_repr(name, *args, **kw): - """ - Construct a standard representation of a class instance. - """ - args = [repr(a) for a in args] - kw = ['%s=%r' % (k, kw[k]) for k in sorted(kw)] - return '%s(%s)' % (name, ', '.join(args + kw)) - -def realm_to_suffix(realm_name): - s = realm_name.split(".") - terms = ["dc=" + x.lower() for x in s] - return ",".join(terms) - def validate_host_dns(log, fqdn): """ See if the hostname has a DNS A record. |