This fixes `import json` for Python < 2.6. I'm just using the same
compat.py from wehjit.
>From 292530a1e245657bc80d4a0a9f23e82144ca2e17 Mon Sep 17 00:00:00 2001
From: Jason Gerard DeRose <jder...@redhat.com>
Date: Fri, 16 Oct 2009 11:58:28 -0600
Subject: [PATCH] Fixed 'import json' for simplejson compatability
---
ipalib/compat.py | 51 ++++++++++++++++++++++++++++++++
ipaserver/rpcserver.py | 2 +-
ipawebui/controllers.py | 2 +-
tests/test_ipaserver/test_rpcserver.py | 2 +-
4 files changed, 54 insertions(+), 3 deletions(-)
create mode 100644 ipalib/compat.py
diff --git a/ipalib/compat.py b/ipalib/compat.py
new file mode 100644
index 0000000..8b9855e
--- /dev/null
+++ b/ipalib/compat.py
@@ -0,0 +1,51 @@
+# Authors:
+# Jason Gerard DeRose <jder...@redhat.com>
+#
+# Copyright (C) 2008 Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+"""
+Abstracts some compatability issues for Python2.4 - Python2.6.
+
+The ``json`` module was added in Python2.6, which previously was in a seperate
+package and called ``simplejson``. This hack abstracts the difference so you
+can use the ``json`` module generically like this:
+
+>>> from compat import json
+>>> json.dumps({'hello': 'world'})
+'{"hello": "world"}'
+
+In Python 2.6 the ``parse_qs()`` function was moved from the ``cgi`` module to
+the ``urlparse`` module. Although ``cgi.parse_qs()`` is still available and
+only raises a ``PendingDeprecationWarning``, we still provide some
+future-proofing here so you can import ``parse_qs()`` generically like this:
+
+>>> from compat import parse_qs
+>>> parse_qs('hello=world&how=are+you%3F')
+{'how': ['are you?'], 'hello': ['world']}
+
+For more information, see *What's New in Python 2.6*:
+
+ http://docs.python.org/whatsnew/2.6.html
+"""
+
+import sys
+if sys.version_info[:2] >= (2, 6):
+ import json
+ from urlparse import parse_qs
+else:
+ import simplejson as json
+ from cgi import parse_qs
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index 72f2219..0d93752 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -30,7 +30,7 @@ from ipalib.errors import PublicError, InternalError, CommandError, JSONError
from ipalib.request import context, Connection, destroy_context
from ipalib.rpc import xml_dumps, xml_loads
from ipalib.util import make_repr
-import json
+from ipalib.compat import json
def read_input(environ):
diff --git a/ipawebui/controllers.py b/ipawebui/controllers.py
index 616a218..42f1477 100644
--- a/ipawebui/controllers.py
+++ b/ipawebui/controllers.py
@@ -21,7 +21,7 @@ Controllers.
"""
from wehjit import util
-import json
+from ipalib.compat import json
class JSON(object):
diff --git a/tests/test_ipaserver/test_rpcserver.py b/tests/test_ipaserver/test_rpcserver.py
index effac4b..12d37ca 100644
--- a/tests/test_ipaserver/test_rpcserver.py
+++ b/tests/test_ipaserver/test_rpcserver.py
@@ -25,7 +25,7 @@ from tests.util import create_test_api, raises, PluginTester
from tests.data import unicode_str
from ipalib import errors, Command
from ipaserver import rpcserver
-import json
+from ipalib.compat import json
def test_params_2_args_options():
--
1.6.3.3
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
