[IMP] replace simplejson with stdlib json

The stdlib version of the json library is more recent than the 3.5.3
version we are pinning in `requirements.txt`

There is no reason to use it.

Closes odoo#6940

Author: leorochael

addons/auth_oauth/controllers/main.py

@@ -1,7 +1,7 @@
 import functools
 import logging
 
-import simplejson
+import json
 import urlparse
 import werkzeug.utils
 from werkzeug.exceptions import BadRequest
@@ -62,7 +62,7 @@ def list_providers(self):
                 client_id=provider['client_id'],
                 redirect_uri=return_url,
                 scope=provider['scope'],
-                state=simplejson.dumps(state),
+                state=json.dumps(state),
             )
             provider['auth_link'] = provider['auth_endpoint'] + '?' + werkzeug.url_encode(params)
 
@@ -132,7 +132,7 @@ class OAuthController(http.Controller):
     @http.route('/auth_oauth/signin', type='http', auth='none')
     @fragment_to_query_string
     def signin(self, **kw):
-        state = simplejson.loads(kw['state'])
+        state = json.loads(kw['state'])
         dbname = state['d']
         provider = state['p']
         context = state.get('c', {})
@@ -195,5 +195,5 @@ def oea(self, **kw):
             'c': {'no_user_creation': True},
         }
 
-        kw['state'] = simplejson.dumps(state)
+        kw['state'] = json.dumps(state)
         return self.signin(**kw)

addons/auth_oauth/res_users.py

@@ -3,7 +3,7 @@
 import werkzeug.urls
 import urlparse
 import urllib2
-import simplejson
+import json
 
 import openerp
 from openerp.addons.auth_signup.res_users import SignupError
@@ -33,7 +33,7 @@ def _auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None):
             url = endpoint + '?' + params
         f = urllib2.urlopen(url)
         response = f.read()
-        return simplejson.loads(response)
+        return json.loads(response)
 
     def _auth_oauth_validate(self, cr, uid, provider, access_token, context=None):
         """ return the validation data corresponding to the access token """
@@ -82,7 +82,7 @@ def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None
         except openerp.exceptions.AccessDenied, access_denied_exception:
             if context and context.get('no_user_creation'):
                 return None
-            state = simplejson.loads(params['state'])
+            state = json.loads(params['state'])
             token = state.get('t')
             values = self._generate_signup_values(cr, uid, provider, validation, params, context=context)
             try:

addons/base_geolocalize/models/res_partner.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-try:
-    import simplejson as json
-except ImportError:
-    import json     # noqa
+import json
 import urllib
 
 from openerp.osv import osv, fields

addons/base_import/controllers.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import simplejson
+import json
 
 from openerp.http import Controller, route
 
@@ -15,4 +15,4 @@ def set_file(self, req, file, import_id, jsonp='callback'):
         }, req.context)
 
         return 'window.top.%s(%s)' % (
-            jsonp, simplejson.dumps({'result': written}))
+            jsonp, json.dumps({'result': written}))

addons/base_setup/base_setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import simplejson
+import json
 import cgi
 from openerp import tools
 from openerp.osv import fields, osv

addons/bus/models/bus.py

@@ -4,7 +4,6 @@
 import logging
 import random
 import select
-import simplejson
 import threading
 import time
 
@@ -21,7 +20,7 @@
 # Bus
 #----------------------------------------------------------
 def json_dump(v):
-    return simplejson.dumps(v, separators=(',', ':'))
+    return json.dumps(v, separators=(',', ':'))
 
 def hashable(key):
     if isinstance(key, list):
@@ -79,8 +78,8 @@ def poll(self, channels, last=0):
         for notif in notifications:
             result.append({
                 'id': notif['id'],
-                'channel': simplejson.loads(notif['channel']),
-                'message': simplejson.loads(notif['message']),
+                'channel': json.loads(notif['channel']),
+                'message': json.loads(notif['message']),
             })
         return result
 

addons/calendar/controllers/main.py

@@ -1,4 +1,4 @@
-import simplejson
+import json
 import openerp
 import openerp.http as http
 from openerp.http import request

addons/google_account/controllers/main.py

@@ -1,4 +1,4 @@
-import simplejson
+import json
 import urllib
 import openerp
 from openerp import http
@@ -14,7 +14,7 @@ class google_auth(http.Controller):
     def oauth2callback(self, **kw):
         """ This route/function is called by Google when user Accept/Refuse the consent of Google """
 
-        state = simplejson.loads(kw['state'])
+        state = json.loads(kw['state'])
         dbname = state.get('d')
         service = state.get('s')
         url_return = state.get('f')

addons/google_account/google_account.py

@@ -10,7 +10,7 @@
 
 import werkzeug.urls
 import urllib2
-import simplejson
+import json
 
 import logging
 _logger = logging.getLogger(__name__)
@@ -37,7 +37,7 @@ def generate_refresh_token(self, cr, uid, service, authorization_code, context=N
             error_msg = "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"
             raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
 
-        content = simplejson.loads(content)
+        content = json.loads(content)
         return content.get('refresh_token')
 
     def _get_google_token_uri(self, cr, uid, service, scope, context=None):
@@ -63,7 +63,7 @@ def _get_authorize_uri(self, cr, uid, from_url, service, scope=False, context=No
         params = {
             'response_type': 'code',
             'client_id': client_id,
-            'state': simplejson.dumps(state_obj),
+            'state': json.dumps(state_obj),
             'scope': scope or 'https://www.googleapis.com/auth/%s' % (service,),
             'redirect_uri': base_url + '/google_account/authentication',
             'approval_prompt': 'force',
@@ -123,7 +123,7 @@ def _refresh_google_token_json(self, cr, uid, refresh_token, service, context=No
                 registry = openerp.modules.registry.RegistryManager.get(request.session.db)
                 with registry.cursor() as cur:
                     self.pool['res.users'].write(cur, uid, [uid], {'google_%s_rtoken' % service: False}, context=context)
-            error_key = simplejson.loads(e.read()).get("error", "nc")
+            error_key = json.loads(e.read()).get("error", "nc")
             _logger.exception("Bad google request : %s !" % error_key)
             error_msg = "Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired [%s]" % error_key
             raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
@@ -156,7 +156,7 @@ def _do_request(self, cr, uid, uri, params={}, headers={}, type='POST', preuri="
                 response = False
             else:
                 content = request.read()
-                response = simplejson.loads(content)
+                response = json.loads(content)
 
             try:
                 ask_time = datetime.strptime(request.headers.get('date'), "%a, %d %b %Y %H:%M:%S %Z")

addons/google_calendar/google_calendar.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import operator
-import simplejson
+import json
 import urllib2
 
 import openerp
@@ -267,7 +267,7 @@ def create_an_event(self, cr, uid, event, context=None):
 
         url = "/calendar/v3/calendars/%s/events?fields=%s&access_token=%s" % ('primary', urllib2.quote('id,updated'), self.get_token(cr, uid, context))
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
-        data_json = simplejson.dumps(data)
+        data_json = json.dumps(data)
 
         return gs_pool._do_request(cr, uid, url, data_json, headers, type='POST', context=context)
 
@@ -368,7 +368,7 @@ def update_to_google(self, cr, uid, oe_event, google_event, context):
         headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
         data = self.generate_data(cr, uid, oe_event, context=context)
         data['sequence'] = google_event.get('sequence', 0)
-        data_json = simplejson.dumps(data)
+        data_json = json.dumps(data)
 
         status, content, ask_time = self.pool['google.service']._do_request(cr, uid, url, data_json, headers, type='PATCH', context=context)
 
@@ -402,7 +402,7 @@ def update_recurrent_event_exclu(self, cr, uid, instance_id, event_ori_google_id
 
         data['sequence'] = self.get_sequence(cr, uid, instance_id, context)
 
-        data_json = simplejson.dumps(data)
+        data_json = json.dumps(data)
         return gs_pool._do_request(cr, uid, url, data_json, headers, type='PUT', context=context)
 
     def update_from_google(self, cr, uid, event, single_event_dict, type, context):
@@ -697,7 +697,7 @@ def update_events(self, cr, uid, lastSync=False, context=None):
                     registry = openerp.modules.registry.RegistryManager.get(request.session.db)
                     with registry.cursor() as cur:
                         self.pool['res.users'].write(cur, SUPERUSER_ID, [uid], {'google_calendar_last_sync_date': False}, context=context)
-                error_key = simplejson.loads(str(e))
+                error_key = json.loads(str(e))
                 error_key = error_key.get('error', {}).get('message', 'nc')
                 error_msg = "Google is lost... the next synchro will be a full synchro. \n\n %s" % error_key
                 raise self.pool.get('res.config.settings').get_config_warning(cr, _(error_msg), context=context)
@@ -858,7 +858,7 @@ def update_events(self, cr, uid, lastSync=False, context=None):
                         try:
                             self.delete_an_event(cr, uid, current_event[0], context=context)
                         except Exception, e:
-                            error = simplejson.loads(e.read())
+                            error = json.loads(e.read())
                             error_nr = error.get('error', {}).get('code')
                             # if already deleted from gmail or never created
                             if error_nr in (404, 410,):

addons/google_spreadsheet/google_spreadsheet.py

@@ -1,7 +1,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import cgi
-import simplejson
+import json
 import logging
 from lxml import etree
 import re
@@ -28,7 +28,7 @@ def write_config_formula(self, cr, uid, attachment_id, spreadsheet_key, model, d
         display_fields = []
         for node in doc.xpath("//field"):
             if node.get('modifiers'):
-                modifiers = simplejson.loads(node.get('modifiers'))
+                modifiers = json.loads(node.get('modifiers'))
                 if not modifiers.get('invisible') and not modifiers.get('tree_invisible'):
                     display_fields.append(node.get('name'))
         fields = " ".join(display_fields)

addons/hw_escpos/controllers/main.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import commands
 import logging
-import simplejson
+import json
 import os
 import os.path
 import io

addons/hw_proxy/controllers/main.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 import logging
 import commands
-import simplejson
+import json
 import os
 import os.path
 import openerp
 import time
 import random
 import subprocess
-import simplejson
+import json
 import werkzeug
 import werkzeug.wrappers
 _logger = logging.getLogger(__name__)

addons/mail/models/mail_thread.py

@@ -4,10 +4,7 @@
 import datetime
 import dateutil
 import email
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 from lxml import etree
 import logging
 import pytz

addons/payment_adyen/controllers/main.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 import logging
 import pprint
 import werkzeug

addons/payment_adyen/models/adyen.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-'8' "-*-"
 
 import base64
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 from hashlib import sha1
 import hmac
 import logging

addons/payment_buckaroo/controllers/main.py

@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-try:
-    import simplejson as json
-except ImportError:
-    import json
-
+import json
 import logging
 import pprint
 import werkzeug

addons/payment_paypal/controllers/main.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 import logging
 import pprint
 import urllib2

addons/payment_paypal/models/paypal.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-'8' "-*-"
 
 import base64
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 import logging
 import urlparse
 import werkzeug.urls

addons/payment_sips/controllers/main.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 import logging
 import werkzeug
 

addons/payment_sips/models/sips.py

@@ -1,9 +1,6 @@
 # -*- coding: utf-'8' "-*-"
 
-try:
-    import simplejson as json
-except ImportError:
-    import json
+import json
 import logging
 from hashlib import sha256
 import urlparse

addons/point_of_sale/tools/posbox/overwrite_before_init/etc/init_posbox_image.sh

@@ -31,7 +31,7 @@ apt-get -y autoremove
 apt-get update
 apt-get -y dist-upgrade
 
-PKGS_TO_INSTALL="adduser postgresql-client python python-dateutil python-decorator python-docutils python-feedparser python-imaging python-jinja2 python-ldap python-libxslt1 python-lxml python-mako python-mock python-openid python-passlib python-psutil python-psycopg2 python-pybabel python-pychart python-pydot python-pyparsing python-pypdf python-reportlab python-requests python-simplejson python-tz python-unittest2 python-vatnumber python-vobject python-werkzeug python-xlwt python-yaml postgresql python-gevent python-serial python-pip python-dev localepurge vim mc mg screen"
+PKGS_TO_INSTALL="adduser postgresql-client python python-dateutil python-decorator python-docutils python-feedparser python-imaging python-jinja2 python-ldap python-libxslt1 python-lxml python-mako python-mock python-openid python-passlib python-psutil python-psycopg2 python-pybabel python-pychart python-pydot python-pyparsing python-pypdf python-reportlab python-requests python-tz python-vatnumber python-vobject python-werkzeug python-xlwt python-yaml postgresql python-gevent python-serial python-pip python-dev localepurge vim mc mg screen"
 
 apt-get -y install ${PKGS_TO_INSTALL}