summaryrefslogtreecommitdiff
path: root/jsonrpclib/jsonclass.py
diff options
context:
space:
mode:
authorPaul Smith <prs247au@gmail.com>2017-05-20 10:56:51 +1000
committerPaul Smith <prs247au@gmail.com>2017-05-20 10:56:51 +1000
commit9edb32cf07c332805b53f1772e7bdefa1d2d4983 (patch)
tree96e6f1519c86b6655cd1c4ed38126ec1d0868903 /jsonrpclib/jsonclass.py
parent3789355028206a63b2d161a9c47c5e2d0b212b32 (diff)
downloadjsonrpclib-9edb32cf07c332805b53f1772e7bdefa1d2d4983.tar.gz
Put in some changes suggested by Josh
Diffstat (limited to 'jsonrpclib/jsonclass.py')
-rw-r--r--jsonrpclib/jsonclass.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/jsonrpclib/jsonclass.py b/jsonrpclib/jsonclass.py
index 34a1939..31f829d 100644
--- a/jsonrpclib/jsonclass.py
+++ b/jsonrpclib/jsonclass.py
@@ -6,10 +6,10 @@ from jsonrpclib import config
iter_types = (dict, list, tuple)
value_types = (bool, )
try:
- string_types = (str, unicode)
+ string_types = (basestring, ) # Python 2.7
numeric_types = (int, long, float)
except NameError:
- string_types = (str, )
+ string_types = (str, ) # Python 3.x
numeric_types = (int, float)
supported_types = iter_types+string_types+numeric_types+value_types