diff options
Diffstat (limited to 'jsonrpclib/SimpleJSONRPCServer.py')
| -rw-r--r-- | jsonrpclib/SimpleJSONRPCServer.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/jsonrpclib/SimpleJSONRPCServer.py b/jsonrpclib/SimpleJSONRPCServer.py index 221d0c8..cf48a66 100644 --- a/jsonrpclib/SimpleJSONRPCServer.py +++ b/jsonrpclib/SimpleJSONRPCServer.py @@ -10,7 +10,6 @@ except ImportError: import socket import logging import os -import types import traceback import sys try: @@ -18,6 +17,10 @@ try: except ImportError: # For Windows fcntl = None +try: + string_types = (str, unicode) +except NameError: + string_types = (str, ) def get_version(request): @@ -43,7 +46,7 @@ def validate_request(request): request.setdefault('params', []) method = request.get('method', None) params = request.get('params') - if not method or not isinstance(method, str) or \ + if not method or not isinstance(method, string_types) or \ not isinstance(params, (list, dict, tuple)): fault = Fault( -32600, 'Invalid request parameters or method.', rpcid=rpcid |