FTS-222: Using simpleson for (de)serialization

With Python 2.6 it shows an actual improvement.

dist/fts-rest.spec

@@ -38,7 +38,8 @@ Requires:       mod_wsgi
 Requires:       python-fts = %{version}-%{release}
 Requires:       python-paste-deploy
 Requires:       python-pylons
-Requires:       gfal2-python
+Requires:       python-simplejson%{?_isa}
+Requires:       gfal2-python%{?_isa}
 
 %description
 This package provides the FTS3 REST interface

src/fts3/cli/jobdeletionsubmitter.py

@@ -15,9 +15,9 @@
 
 from datetime import timedelta
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json 
 import logging
 import sys
 import time

src/fts3/cli/jobsubmitter.py

@@ -17,9 +17,9 @@
 
 from datetime import timedelta
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 import logging
 import sys
 import time

src/fts3/cli/snapshot.py

@@ -14,9 +14,9 @@
 #   limitations under the License.
 
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 
 from base import Base
 from fts3.rest.client import Inquirer

src/fts3/cli/utils.py

@@ -16,9 +16,9 @@
 #   limitations under the License.
 
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json 
 
 
 def job_human_readable(job):

src/fts3/cli/whoami.py

@@ -16,9 +16,9 @@
 #   limitations under the License.
 
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json 
 
 from base import Base
 from fts3.rest.client import Inquirer

src/fts3/model/base.py

@@ -17,7 +17,10 @@
 
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.types import TypeDecorator, String
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import types
 
 

src/fts3/rest/client/ban.py

@@ -14,9 +14,9 @@
 #   limitations under the License.
 
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 import urllib
 
 

src/fts3/rest/client/context.py

@@ -23,9 +23,9 @@ except:
     from pytz import utc as UTC
 import getpass
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 import logging
 import os
 import sys

src/fts3/rest/client/delegator.py

@@ -23,9 +23,9 @@ except:
     from pytz import utc as UTC
 import ctypes
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 import logging
 import platform
 import sys

src/fts3/rest/client/inquirer.py

@@ -16,9 +16,9 @@
 #   limitations under the License.
 
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 import urllib
 
 from exceptions import *

src/fts3/rest/client/request.py

@@ -15,9 +15,9 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 import logging
 import pycurl
 from exceptions import *

src/fts3/rest/client/submitter.py

@@ -16,9 +16,9 @@
 #   limitations under the License.
 
 try:
-    import json
-except:
     import simplejson as json
+except:
+    import json
 
 
 class Submitter(object):

src/fts3rest/fts3rest/controllers/banning.py

@@ -13,7 +13,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import logging
 from datetime import datetime
 from pylons import request

src/fts3rest/fts3rest/controllers/config.py

@@ -15,7 +15,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import logging
 
 from numbers import Number

src/fts3rest/fts3rest/controllers/datamanagement.py

@@ -26,7 +26,10 @@ import stat
 import tempfile
 import urlparse
 import urllib
-import json
+try:
+    import simplejson as json
+except:
+    import json
 
 from fts3.model import Credential
 from fts3rest.lib.api import doc

src/fts3rest/fts3rest/controllers/delegation.py

@@ -15,7 +15,10 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import logging
 import os
 import shlex

src/fts3rest/fts3rest/controllers/jobs.py

@@ -19,7 +19,10 @@ from datetime import datetime, timedelta
 from pylons import request
 from sqlalchemy.orm import noload
 
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import logging
 import urllib
 

src/fts3rest/fts3rest/controllers/oauth2.py

@@ -14,7 +14,10 @@
 #   limitations under the License.
 
 import base64
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import logging
 import os
 import pylons

src/fts3rest/fts3rest/lib/gfal2_wrapper.py

@@ -16,7 +16,10 @@
 #   limitations under the License.
 
 import errno
-import json
+try:
+    import simplejson as json
+except:
+    import json
 import os
 import signal
 from StringIO import StringIO