From 69acff450c043bdd7d70da473c3adafdd9d3fe03 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jderose@redhat.com>
Date: Wed, 14 Jan 2009 12:00:47 -0700
Subject: New Param: removed more depreciated 'import ipa_types'

---
 ipalib/cli.py                      | 3 +--
 ipalib/frontend.py                 | 1 +
 make-test                          | 2 +-
 tests/test_ipalib/test_frontend.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ipalib/cli.py b/ipalib/cli.py
index 442e5061a..f6c187b3a 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 baa37b176..64323d0a9 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 1a401635c..10840cf51 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 c40933175..4a0e48d06 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():
-- 
cgit