Revert latest import changes in jsonrpclib.
This commit is contained in:
parent
73a39a6c02
commit
74224e4d53
|
@ -3,7 +3,7 @@ import inspect
|
|||
import re
|
||||
import traceback
|
||||
|
||||
from nantic_monitoring_network.jsonrpclib import config
|
||||
from jsonrpclib import config
|
||||
|
||||
iter_types = [
|
||||
types.DictType,
|
||||
|
|
|
@ -57,9 +57,9 @@ import string
|
|||
import random
|
||||
|
||||
# Library includes
|
||||
import nantic_monitoring_network.jsonrpclib
|
||||
from nantic_monitoring_network.jsonrpclib import config
|
||||
from nantic_monitoring_network.jsonrpclib import history
|
||||
import jsonrpclib
|
||||
from jsonrpclib import config
|
||||
from jsonrpclib import history
|
||||
|
||||
# JSON library importing
|
||||
cjson = None
|
||||
|
@ -486,7 +486,7 @@ def dumps(params=[], methodname=None, methodresponse=None,
|
|||
raise ValueError('Method name must be a string, or methodresponse '+
|
||||
'must be set to True.')
|
||||
if config.use_jsonclass == True:
|
||||
from nantic_monitoring_network.jsonrpclib import jsonclass
|
||||
from jsonrpclib import jsonclass
|
||||
params = jsonclass.dump(params)
|
||||
if methodresponse is True:
|
||||
if rpcid is None:
|
||||
|
@ -514,7 +514,7 @@ def loads(data):
|
|||
# should return something like the following:
|
||||
# { 'jsonrpc':'2.0', 'error': fault.error(), id: None }
|
||||
if config.use_jsonclass == True:
|
||||
from nantic_monitoring_network.jsonrpclib import jsonclass
|
||||
from jsonrpclib import jsonclass
|
||||
result = jsonclass.load(result)
|
||||
return result
|
||||
|
||||
|
|
Loading…
Reference in New Issue