Skip to content

Make service compatible with python 3 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tubaman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make service compatible with python 3 #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions txjason/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ def send_message(msg):
if __name__ == '__main__':

# Adds the method login to the service as a 'login'.
chat_service.add(login, types=[basestring, basestring, int])
chat_service.add(login, types=[str, str, int])

# Adds the method receive_message to the service as a 'recv_msg'.
chat_service.add(receive_message, name='recv_msg',
types={"msg": basestring, "id": int})
types={"msg": str, "id": int})

# Adds the method send_message as a 'send_msg' to the service.
chat_service.add(send_message, 'send_msg')
Expand Down Expand Up @@ -189,7 +189,7 @@ def call_py(self, jsondata):
rdata = json.loads(jsondata)
except ValueError:
raise ParseError
except ParseError, e:
except ParseError as e:
defer.returnValue(self._get_err(e))
return

Expand Down Expand Up @@ -218,12 +218,12 @@ def call_py(self, jsondata):
request_ = self._get_default_vals()
try:
self._fill_request(request_, rdata_)
except InvalidRequestError, e:
except InvalidRequestError as e:
err = self._get_err(e, request_['id'])
if err:
responds.append(err)
continue
except JSONRPCError, e:
except JSONRPCError as e:
err = self._get_err(e, request_['id'])
if err:
responds.append(err)
Expand All @@ -236,7 +236,7 @@ def call_py(self, jsondata):
# TODO: We should use a deferred list so requests
# are processed in parallel
respond = yield self._handle_request(request_)
except JSONRPCError, e:
except JSONRPCError as e:
respond = self._get_err(e,
request_['id'],
request_['jsonrpc'])
Expand All @@ -255,9 +255,9 @@ def call_py(self, jsondata):
else:
# empty dict, list or wrong type
raise InvalidRequestError
except InvalidRequestError, e:
except InvalidRequestError as e:
defer.returnValue(self._get_err(e, request['id']))
except JSONRPCError, e:
except JSONRPCError as e:
defer.returnValue(self._get_err(e,
request['id'],
request['jsonrpc']))
Expand Down Expand Up @@ -362,7 +362,7 @@ def _get_id(self, rdata):
InvalidRequestError will be raised if the id value has invalid type.
"""
if 'id' in rdata:
if isinstance(rdata['id'], basestring) or \
if isinstance(rdata['id'], str) or \
isinstance(rdata['id'], int) or \
isinstance(rdata['id'], long) or \
isinstance(rdata['id'], float) or \
Expand All @@ -384,7 +384,7 @@ def _get_method(self, rdata):
does not exist.
"""
if 'method' in rdata:
if not isinstance(rdata['method'], basestring):
if not isinstance(rdata['method'], str):
raise InvalidRequestError
else:
raise InvalidRequestError
Expand Down