summaryrefslogtreecommitdiffstats
path: root/ipalib/util.py
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2010-08-02 14:36:33 -0400
committerRob Crittenden <rcritten@redhat.com>2010-08-02 16:28:07 -0400
commitf9ff041c5cd5ac11af2edb59cb7a707582193df6 (patch)
tree78bdceb1b3b637be34fbb11ff34d8d17fdf88446 /ipalib/util.py
parent47d4fcdd8178ec4b8403efa4f80eaa009c32d78b (diff)
downloadfreeipa-f9ff041c5cd5ac11af2edb59cb7a707582193df6.tar.gz
freeipa-f9ff041c5cd5ac11af2edb59cb7a707582193df6.tar.xz
freeipa-f9ff041c5cd5ac11af2edb59cb7a707582193df6.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/util.py')
-rw-r--r--ipalib/util.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/ipalib/util.py b/ipalib/util.py
index f5f0c9641..76be9a6d7 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -1,8 +1,7 @@
# Authors:
# Jason Gerard DeRose <jderose@redhat.com>
-# Pavel Zuna <pzuna@redhat.com>
#
-# Copyright (C) 2010 Red Hat
+# Copyright (C) 2008 Red Hat
# see file 'COPYING' for use and warranty information
#
# This program is free software; you can redistribute it and/or
@@ -31,12 +30,6 @@ import socket
from ipalib import errors
-def json_serialize(obj):
- if not callable(getattr(obj, '__json__', None)):
- # raise TypeError('%r is not JSON serializable')
- return ''
- return obj.__json__()
-
def get_current_principal():
try:
return unicode(krbV.default_context().default_ccache().principal().name)