[Erp5-report] r41731 jm - /erp5/trunk/utils/cloudooo/cloudooo/helper/

[nobody at svn.erp5.org]

Author: jm
Date: Thu Dec 23 19:59:34 2010
New Revision: 41731

URL: http://svn.erp5.org?rev=41731&view=rev
Log:
Make cloudooo.helper.uno* work with Python 2.5

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/helper/unoconverter.py
    erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/helper/unoconverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/helper/unoconverter.py?rev=41731&r1=41730&r2=41731&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/helper/unoconverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/helper/unoconverter.py [utf8] Thu Dec 23 19:59:34 2010
@@ -287,7 +287,10 @@ def main():
   
   param_list = [tuple[0] for tuple in iter(opt_list)]
 
-  import json
+  try:
+    import json
+  except ImportError:
+    import simplejson as json
   refresh = None
   for opt, arg in iter(opt_list):
     if opt in ('-h', '--help'):

Modified: erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py?rev=41731&r1=41730&r2=41731&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py [utf8] Thu Dec 23 19:59:34 2010
@@ -28,7 +28,10 @@
 ##############################################################################
 
 import sys
-import json
+try:
+  import json
+except ImportError:
+  import simplejson as json
 import helper_utils
 from os import environ, path, putenv
 from getopt import getopt, GetoptError