summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2008-09-02 20:33:08 +0000
committerJason Gerard DeRose <jderose@redhat.com>2008-09-02 20:33:08 +0000
commit4f4e8e2712269b41f2863f96d31d5e67ad7b4564 (patch)
tree069553d0feeb1e1cd3cf97461f0e8b57f8054d74
parent2784847b731232c80c9085325b09f1aa72c6afcd (diff)
downloadfreeipa.git-4f4e8e2712269b41f2863f96d31d5e67ad7b4564.tar.gz
freeipa.git-4f4e8e2712269b41f2863f96d31d5e67ad7b4564.tar.xz
freeipa.git-4f4e8e2712269b41f2863f96d31d5e67ad7b4564.zip
234: Renamed Option2 to Option
-rw-r--r--ipalib/public.py2
-rw-r--r--ipalib/tests/test_public.py16
2 files changed, 9 insertions, 9 deletions
diff --git a/ipalib/public.py b/ipalib/public.py
index 102f36b9..d97f519b 100644
--- a/ipalib/public.py
+++ b/ipalib/public.py
@@ -85,7 +85,7 @@ class DefaultFrom(plugable.ReadOnly):
return None
-class Option2(plugable.ReadOnly):
+class Option(plugable.ReadOnly):
def __init__(self, name, doc, type_,
required=False,
multivalue=False,
diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py
index 72b07c4d..2e732179 100644
--- a/ipalib/tests/test_public.py
+++ b/ipalib/tests/test_public.py
@@ -104,18 +104,18 @@ class test_DefaltFrom(ClassChecker):
assert o(**kw_copy) is None
-class test_Option2(ClassChecker):
+class test_Option(ClassChecker):
"""
- Tests the `public.Option2` class.
+ Tests the `public.Option` class.
"""
- _cls = public.Option2
+ _cls = public.Option
def test_class(self):
assert self.cls.__bases__ == (plugable.ReadOnly,)
def test_init(self):
"""
- Tests the `public.Option2.__init__` method.
+ Tests the `public.Option.__init__` method.
"""
name = 'sn'
doc = 'Last Name'
@@ -156,7 +156,7 @@ class test_Option2(ClassChecker):
def test_normalize(self):
"""
- Tests the `public.Option2.validate` method.
+ Tests the `public.Option.validate` method.
"""
name = 'sn'
doc = 'User last name'
@@ -205,7 +205,7 @@ class test_Option2(ClassChecker):
def test_validate(self):
"""
- Tests the `public.Option2.validate` method.
+ Tests the `public.Option.validate` method.
"""
name = 'sn'
doc = 'User last name'
@@ -259,7 +259,7 @@ class test_Option2(ClassChecker):
def test_get_default(self):
"""
- Tests the `public.Option2.get_default` method.
+ Tests the `public.Option.get_default` method.
"""
name = 'greeting'
doc = 'User greeting'
@@ -293,7 +293,7 @@ class test_Option2(ClassChecker):
def test_get_default(self):
"""
- Tests the `public.Option2.get_values` method.
+ Tests the `public.Option.get_values` method.
"""
name = 'status'
doc = 'Account status'