diff options
| author | Petr Spacek <pspacek@redhat.com> | 2016-03-07 13:30:35 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2016-04-28 18:46:06 +0200 |
| commit | 6752d6404af13a933105e53ea5875adfb933e293 (patch) | |
| tree | f8b9c52c1adc929f9d00c7c9074b569b275f7604 /ipapython/ipautil.py | |
| parent | 41464b74f43ab0a7f9ad650bdaac19308fc7ff5c (diff) | |
| download | freeipa-6752d6404af13a933105e53ea5875adfb933e293.tar.gz freeipa-6752d6404af13a933105e53ea5875adfb933e293.tar.xz freeipa-6752d6404af13a933105e53ea5875adfb933e293.zip | |
Move function is_auto_empty_zone() into ipapython.dnsutil
I'm going to extend this so it is better to have it in module.
At the same time it is now using shared assert_absolute_dnsname()
helper.
https://fedorahosted.org/freeipa/ticket/5710
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython/ipautil.py')
| -rw-r--r-- | ipapython/ipautil.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 4c9693368..4597f1c63 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -52,7 +52,7 @@ from ipapython.ipa_log_manager import root_logger from ipapython import config from ipaplatform.paths import paths from ipapython.dn import DN -from ipapython.dnsutil import DNSName, EMPTY_ZONES +from ipapython.dnsutil import DNSName, is_auto_empty_zone SHARE_DIR = paths.USR_SHARE_IPA_DIR PLUGINS_SHARE_DIR = paths.IPA_PLUGINS @@ -1065,12 +1065,6 @@ def check_zone_overlap(zone, raise_on_error=True): raise ValueError(msg) -def is_auto_empty_zone(zone): - """True if specified zone name exactly matches an automatic empty zone.""" - assert isinstance(zone, DNSName) - return zone in EMPTY_ZONES - - def config_replace_variables(filepath, replacevars=dict(), appendvars=dict()): """ Take a key=value based configuration file, and write new version |