[Erp5-report] r31348 yo - in /erp5/trunk/products/ERP5Type: JSON.py JSONEncoder.py __init__.py

[nobody at svn.erp5.org]

Author: yo
Date: Wed Dec 16 17:46:48 2009
New Revision: 31348

URL: http://svn.erp5.org?rev=31348&view=rev
Log:
Add support for both encoding and decoding JSON, using simplejson or json.

Added:
    erp5/trunk/products/ERP5Type/JSON.py
Modified:
    erp5/trunk/products/ERP5Type/JSONEncoder.py
    erp5/trunk/products/ERP5Type/__init__.py

Added: erp5/trunk/products/ERP5Type/JSON.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/JSON.py?rev=31348&view=auto
==============================================================================
--- erp5/trunk/products/ERP5Type/JSON.py (added)
+++ erp5/trunk/products/ERP5Type/JSON.py [utf8] Wed Dec 16 17:46:48 2009
@@ -1,0 +1,43 @@
+# -*- coding: utf-8 -*-
+#############################################################################
+#
+# Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved.
+#                    Yoshinori Okuji <yo at 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.')
+
+

Modified: erp5/trunk/products/ERP5Type/JSONEncoder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/JSONEncoder.py?rev=31348&r1=31347&r2=31348&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/JSONEncoder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/JSONEncoder.py [utf8] Wed Dec 16 17:46:48 2009
@@ -399,4 +399,7 @@
 __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) 

Modified: erp5/trunk/products/ERP5Type/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/__init__.py?rev=31348&r1=31347&r2=31348&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/__init__.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/__init__.py [utf8] Wed Dec 16 17:46:48 2009
@@ -127,4 +127,4 @@
 allow_module('Products.ERP5Type.JSONEncoder')
 allow_module('Products.ERP5Type.Log')
 allow_module('Products.ERP5Type.ConnectionPlugin.SOAPWSDLConnection')
-
+ModuleSecurityInfo('Products.ERP5Type.JSON').declarePublic('dumps', 'loads')