1 *** joshmarshall-jsonrpclib-e3a3cde/jsonrpclib/jsonrpc.py.orig	Thu Dec 15 09:46:35 2011

     2 --- joshmarshall-jsonrpclib-e3a3cde/jsonrpclib/jsonrpc.py	Thu Dec 15 09:48:42 2011

     3 ***************

     4 *** 69,81 ****

     5   except ImportError:

     6       try:

     7 !         import json

     8       except ImportError:

     9 !         try:

    10 !             import simplejson as json

    11 !         except ImportError:

    12 !             raise ImportError(

    13 !                 'You must have the cjson, json, or simplejson ' +

    14 !                 'module(s) available.'

    15 !             )

    16   

    17   IDCHARS = string.ascii_lowercase+string.digits

    18 --- 69,81 ----

    19   except ImportError:

    20       try:

    21 !         # use simplejson since it doesn't encode strings as unicode, which

    22 !         # allows us to avoid python issue 4978.  (4978 causes json rpc calls

    23 !         # using keword parameters to fail.)

    24 !         import simplejson as json

    25       except ImportError:

    26 !         raise ImportError(

    27 !             'You must have the cjson or simplejson ' +

    28 !             'module(s) available.'

    29 !         )

    30   

    31   IDCHARS = string.ascii_lowercase+string.digits