summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2009-01-14 12:00:47 -0700
committerJason Gerard DeRose <jderose@redhat.com>2009-01-14 12:00:47 -0700
commit69acff450c043bdd7d70da473c3adafdd9d3fe03 (patch)
tree9ed486e508a95b1a4a297fe0516c538190504341
parent2b2e73e7df90d38175e035d6ada4d752120dc0ec (diff)
downloadfreeipa-69acff450c043bdd7d70da473c3adafdd9d3fe03.tar.gz
freeipa-69acff450c043bdd7d70da473c3adafdd9d3fe03.tar.xz
freeipa-69acff450c043bdd7d70da473c3adafdd9d3fe03.zip
New Param: removed more depreciated 'import ipa_types'
-rw-r--r--ipalib/cli.py3
-rw-r--r--ipalib/frontend.py1
-rwxr-xr-xmake-test2
-rw-r--r--tests/test_ipalib/test_frontend.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 442e5061..f6c187b3 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -36,7 +36,6 @@ import frontend
import backend
import errors
import plugable
-import ipa_types
import util
from constants import CLI_TAB
@@ -801,7 +800,7 @@ class CLI(object):
)
if 'password' in option.flags:
kw['action'] = 'store_true'
- elif isinstance(option.type, ipa_types.Bool):
+ elif option.type is bool:
if option.default is True:
kw['action'] = 'store_false'
else:
diff --git a/ipalib/frontend.py b/ipalib/frontend.py
index baa37b17..64323d0a 100644
--- a/ipalib/frontend.py
+++ b/ipalib/frontend.py
@@ -28,6 +28,7 @@ from plugable import lock, check_name
import errors
from errors import check_type, check_isinstance, raise_TypeError
import parameters
+from parameters import create_param
from util import make_repr
diff --git a/make-test b/make-test
index 1a401635..10840cf5 100755
--- a/make-test
+++ b/make-test
@@ -10,7 +10,7 @@ do
if [[ -f $executable ]]; then
echo "[ $name: Starting tests... ]"
((runs += 1))
- if $executable /usr/bin/nosetests -v --with-doctest
+ if $executable /usr/bin/nosetests -v
then
echo "[ $name: Tests OK ]"
else
diff --git a/tests/test_ipalib/test_frontend.py b/tests/test_ipalib/test_frontend.py
index c4093317..4a0e48d0 100644
--- a/tests/test_ipalib/test_frontend.py
+++ b/tests/test_ipalib/test_frontend.py
@@ -23,7 +23,7 @@ Test the `ipalib.frontend` module.
from tests.util import raises, getitem, no_set, no_del, read_only
from tests.util import check_TypeError, ClassChecker, create_test_api
-from ipalib import frontend, backend, plugable, errors, ipa_types, config
+from ipalib import frontend, backend, plugable, errors, parameters, config
def test_RULE_FLAG():