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/bindinstance.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/bindinstance.py')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index ce3166122..fa3864a22 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -395,7 +395,7 @@ class BindInstance(service.Service): self.domain = domain_name self.forwarders = forwarders self.host = fqdn.split(".")[0] - self.suffix = util.realm_to_suffix(self.realm) + self.suffix = ipautil.realm_to_suffix(self.realm) self.ntp = ntp self.reverse_zone = reverse_zone self.zone_refresh = zone_refresh @@ -614,7 +614,7 @@ class BindInstance(service.Service): self.realm = realm_name self.domain = domain_name self.host = fqdn.split(".")[0] - self.suffix = util.realm_to_suffix(self.realm) + self.suffix = ipautil.realm_to_suffix(self.realm) self.ntp = ntp self.reverse_zone = reverse_zone @@ -622,7 +622,7 @@ class BindInstance(service.Service): def remove_master_dns_records(self, fqdn, realm_name, domain_name): host = fqdn.split(".")[0] - suffix = util.realm_to_suffix(realm_name) + suffix = ipautil.realm_to_suffix(realm_name) zone = domain_name resource_records = ( |