From 74224e4d530b65fe65bb5f7f5fc028b5e1ecd89e Mon Sep 17 00:00:00 2001 From: Albert Cervera i Areny Date: Sat, 25 Apr 2015 02:19:54 +0200 Subject: [PATCH] Revert latest import changes in jsonrpclib. --- jsonrpclib/jsonclass.py | 2 +- jsonrpclib/jsonrpc.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jsonrpclib/jsonclass.py b/jsonrpclib/jsonclass.py index c4a6b98..1d86d5f 100644 --- a/jsonrpclib/jsonclass.py +++ b/jsonrpclib/jsonclass.py @@ -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, diff --git a/jsonrpclib/jsonrpc.py b/jsonrpclib/jsonrpc.py index 98f6abc..555fa8e 100644 --- a/jsonrpclib/jsonrpc.py +++ b/jsonrpclib/jsonrpc.py @@ -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