diff options
author | Stephen Gallagher <sgallagh@redhat.com> | 2010-08-02 14:36:33 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2010-08-02 16:28:07 -0400 |
commit | f9ff041c5cd5ac11af2edb59cb7a707582193df6 (patch) | |
tree | 78bdceb1b3b637be34fbb11ff34d8d17fdf88446 /ipalib/parameters.py | |
parent | 47d4fcdd8178ec4b8403efa4f80eaa009c32d78b (diff) | |
download | freeipa-webui-details.tar.gz freeipa-webui-details.tar.xz freeipa-webui-details.zip |
Revert WebUI changeswebui-details
Reverted with:
% git diff --binary HEAD..d4adbc8052faf18fb31e7b1865037aa107067d4b >
revert.patch
% git apply revert.patch
% git commit -a
Diffstat (limited to 'ipalib/parameters.py')
-rw-r--r-- | ipalib/parameters.py | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index a628b6f53..f97c42218 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -100,17 +100,15 @@ a more detailed description for clarity. """ import re -import csv -import json - from types import NoneType -from util import make_repr, json_serialize +from util import make_repr from request import ugettext from plugable import ReadOnly, lock, check_name from errors import ConversionError, RequirementError, ValidationError from errors import PasswordMismatch from constants import NULLS, TYPE_ERROR, CALLABLE_ERROR from text import Gettext, FixMe +import csv class DefaultFrom(ReadOnly): @@ -854,20 +852,6 @@ class Param(ReadOnly): pass return self.default - def __json__(self): - json_dict = {} - for (a, k, d) in self.kwargs: - if k in (callable, DefaultFrom): - continue - elif isinstance(getattr(self, a), frozenset): - json_dict[a] = [k for k in getattr(self, a, [])] - else: - json_dict[a] = getattr(self, a, '') - json_dict['class'] = self.__class__.__name__ - json_dict['name'] = self.name - json_dict['type'] = self.type.__name__ - return json_dict - class Bool(Param): """ |