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 /ipaserver/install/cainstance.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 'ipaserver/install/cainstance.py')
| -rw-r--r-- | ipaserver/install/cainstance.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 56b84fcd8..af8d39aa5 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -240,7 +240,7 @@ class CADSInstance(service.Service): if host_name and realm_name: self.principal = "dogtagldap/%s@%s" % (self.fqdn, self.realm_name) if realm_name: - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.__setup_sub_dict() else: self.suffix = None @@ -250,7 +250,7 @@ class CADSInstance(service.Service): subject_base=None): self.ds_port = ds_port self.realm_name = realm_name.upper() - self.suffix = util.realm_to_suffix(self.realm_name) + self.suffix = ipautil.realm_to_suffix(self.realm_name) self.fqdn = host_name self.dm_password = dm_password self.domain = domain_name |