Add support for both encoding and decoding JSON, using simplejson or json.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31348 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/JSON.py

+# -*- coding: utf-8 -*-
+#############################################################################
+#
+# Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
+#                    Yoshinori Okuji <yo@nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# 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; either version 2
+# of the License, or (at your option) any later version.
+#
+# 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.
+#
+##############################################################################
+
+"""A wrapper module for simplejson or json."""
+
+try:
+  from simplejson import dumps, loads
+except ImportError:
+  try:
+    from json import dumps, loads
+  except ImportError:
+    def dumps(*args, **kw):
+      raise RuntimeError('You must install simplejson to use Products.ERP5Type.JSON.dumps.')
+    def loads(*args, **kw):
+      raise RuntimeError('You must install simplejson to use Products.ERP5Type.JSON.loads.')
+
+

product/ERP5Type/JSONEncoder.py

@@ -399,4 +399,7 @@ class JSONEncoder(object):
 __all__ = ['JSONEncoder']
 
 def encodeInJson(o):
- return JSONEncoder().encode(o) 
+  from warnings import warn
+  warn('Products.ERP5Type.JSONEncoder.encodeInJson is deprecated; use Products.ERP5Type.JSON.dumps instead.',
+       DeprecationWarning)
+  return JSONEncoder().encode(o) 

product/ERP5Type/__init__.py

@@ -127,4 +127,4 @@ allow_module('Products.ERP5Type.Error')
 allow_module('Products.ERP5Type.JSONEncoder')
 allow_module('Products.ERP5Type.Log')
 allow_module('Products.ERP5Type.ConnectionPlugin.SOAPWSDLConnection')
-
+ModuleSecurityInfo('Products.ERP5Type.JSON').declarePublic('dumps', 'loads')