Merge branch 'cherry-pick-ddd10c0b [formerly cbe74ccbf0]-master' into 'master'

Sweeping !9820 from 21.0 to master.
Remove deprecated simplejson module

See merge request atlas/athena!9897

Former-commit-id: 07308be5

Tools/PyJobTransforms/python/trfAMI.py

@@ -11,7 +11,7 @@ import ast
 import json
 import os
 import traceback
-from simplejson import dumps
+from json import dumps
 
 import logging
 msg = logging.getLogger(__name__)

Tools/PyUtils/bin/isDSinFAX.py

@@ -3,7 +3,8 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 import subprocess, threading, os, sys 
-import urllib2,simplejson
+import urllib2
+import json
 
 import argparse
  
@@ -71,7 +72,7 @@ try:
     req = urllib2.Request("http://atlas-agis-api-0.cern.ch/request/service/query/get_se_services/?json&state=ACTIVE&flavour=XROOTD", None)
     opener = urllib2.build_opener()
     f = opener.open(req)
-    res=simplejson.load(f)
+    res=json.load(f)
     for s in res:
 #        print s["name"], s["rc_site"], s["endpoint"]
         ns = site( s["rc_site"], s["endpoint"] )
@@ -90,7 +91,7 @@ try:
     req = urllib2.Request("http://atlas-agis-api-0.cern.ch/request/ddmendpoint/query/list/?json&state=ACTIVE", None)
     opener = urllib2.build_opener()
     f = opener.open(req)
-    res=simplejson.load(f)
+    res=json.load(f)
     for s in res:
         for c in sites:
             if s["rc_site"]==c.name:

Tools/PyUtils/python/AthFile/impl.py

@@ -795,20 +795,14 @@ class AthFileServer(object):
     
     def _load_json_cache(self, fname):
         """load file informations from a JSON file"""
-        try:
-            import simplejson as json
-        except ImportError:
-            import json
+        import json
         with _my_open(fname) as fd:
             cache = json.load(fd)
         return dict((k,AthFile.from_infos(v)) for k,v in cache)
         
     def _save_json_cache(self, fname):
         """save file informations using JSON"""
-        try:
-            import simplejson as json
-        except ImportError:
-            import json
+        import json
         cache = self._cache
         with _my_open(fname, 'w') as fd:
             json.dump([(k, cache[k].fileinfos) for k in cache],