diff options
author | Petr Viktorin <pviktori@redhat.com> | 2012-04-18 11:22:35 -0400 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-05-09 11:54:20 +0200 |
commit | f19218f7d87f5847d51f79b5d2850f90b0ae8407 (patch) | |
tree | 500d3101dc1375d3eb75ffb927040c2593216aa9 /ipalib/util.py | |
parent | c02fcf5d34ad880e082cbc0c7f59fc3812d11c9e (diff) | |
download | freeipa-f19218f7d87f5847d51f79b5d2850f90b0ae8407.tar.gz freeipa-f19218f7d87f5847d51f79b5d2850f90b0ae8407.tar.xz freeipa-f19218f7d87f5847d51f79b5d2850f90b0ae8407.zip |
Remove duplicate and unused utility code
IPA has some unused code from abandoned features (Radius, ipa 1.x user
input, commant-line tab completion), as well as some duplicate utilities.
This patch cleans up the utility modules.
Duplicate code consolidated into ipapython.ipautil:
{ipalib.util,ipaserver.ipautil,ipapython.ipautil}.realm_to_suffix
{ipaserver,ipapython}.ipautil.CIDict
(with style improvements from the ipaserver version)
{ipapython.entity,ipaserver.ipautil}.utf8_encode_value
{ipapython.entity,ipaserver.ipautil}.utf8_encode_values
ipalib.util.get_fqdn was removed in favor of the same function in
ipaserver.install.installutils
Removed unused code:
ipalib.util:
load_plugins_in_dir
import_plugins_subpackage
make_repr (was imported but unused; also removed from tests)
ipapython.ipautil:
format_list
parse_key_value_pairs
read_pairs_file
read_items_file
user_input_plain
AttributeValueCompleter
ItemCompleter
ipaserver.ipautil:
get_gsserror (a different version exists in ipapython.ipautil)
ipaserver.ipautil ended up empty and is removed entirely.
https://fedorahosted.org/freeipa/ticket/2650
Diffstat (limited to 'ipalib/util.py')
-rw-r--r-- | ipalib/util.py | 47 |
1 files changed, 0 insertions, 47 deletions
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. |