RefactoringRope/JsonClient.py

Sun, 24 Dec 2017 17:02:51 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 24 Dec 2017 17:02:51 +0100
changeset 241
e7d5da53faac
parent 210
8b07adc3cb87
child 243
8ea03231bd47
permissions
-rw-r--r--

Fixed a bug in the JsonClient.

163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1 # -*- coding: utf-8 -*-
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
3 # Copyright (c) 2017 Detlev Offenbach <detlev@die-offenbachs.de>
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
4 #
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
5
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
6 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
7 Module implementing the JSON based client base class.
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
8 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
9
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
10 from __future__ import unicode_literals
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
11 try:
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
12 bytes = unicode
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
13 import StringIO as io # __IGNORE_EXCEPTION__
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
14 except NameError:
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
15 import io # __IGNORE_WARNING__
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
16
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
17 import sys
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
18 import socket
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
19 import select
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
20 import traceback
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
21 import json
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
22
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
23
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
24 class JsonClient(object):
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
25 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
26 Class implementing the JSON based client base class.
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
27 """
192
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
28 def __init__(self, host, port, idString=""):
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
29 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
30 Constructor
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
31
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
32 @param host ip address the background service is listening
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
33 @type str
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
34 @param port port of the background service
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
35 @type int
192
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
36 @param idString assigned client id to be sent back to the server in
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
37 order to identify the connection
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
38 @type str
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
39 """
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
40 self.__exitClient = False
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
41 self.__connection = socket.create_connection((host, port))
192
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
42 if idString:
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
43 reply = idString + '\n'
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
44 self.__connection.sendall(reply.encode('utf8', 'backslashreplace'))
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
45
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
46 def sendJson(self, command, params):
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
47 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
48 Public method to send a single refactoring command to the server.
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
49
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
50 @param command command name to be sent
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
51 @type str
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
52 @param params dictionary of named parameters for the command
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
53 @type dict
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
54 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
55 commandDict = {
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
56 "jsonrpc": "2.0",
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
57 "method": command,
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
58 "params": params,
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
59 }
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
60 cmd = json.dumps(commandDict) + '\n'
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
61 self.__connection.sendall(cmd.encode('utf8', 'backslashreplace'))
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
62
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
63 def __receiveJson(self):
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
64 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
65 Private method to receive a JSON encode command and data from the
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
66 server.
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
67
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
68 @return tuple containing the received command and a dictionary
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
69 containing the associated data
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
70 @rtype tuple of (str, dict)
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
71 """
210
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
72 # step 1: receive the data
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
73 # The JSON RPC string is prefixed by a 9 character long length field.
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
74 length = self.__connection.recv(9)
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
75 length = int(length)
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
76 data = b''
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
77 while len(data) < length:
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
78 newData = self.__connection.recv(length - len(data))
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
79 if not newData:
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
80 return None, None
210
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
81 data += newData
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
82
210
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
83 # step 2: decode and convert the data
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
84 line = data.decode(
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
85 'utf8', 'backslashreplace')
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
86 try:
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
87 commandDict = json.loads(line.strip())
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
88 except (TypeError, ValueError) as err:
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
89 self.sendJson("ClientException", {
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
90 "ExceptionType": "ProtocolError",
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
91 "ExceptionValue": str(err),
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
92 "ProtocolData": line.strip(),
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
93 })
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
94 return None, None
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
95
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
96 method = commandDict["method"]
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
97 params = commandDict["params"]
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
98
8b07adc3cb87 Fixed an issue receiving the data sent by the server on the client side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 204
diff changeset
99 return method, params
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
100
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
101 def handleCall(self, method, params):
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
102 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
103 Public method to handle a method call from the server.
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
104
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
105 Note: This is an empty implementation that must be overridden in
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
106 derived classes.
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
107
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
108 @param method requested method name
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
109 @type str
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
110 @param params dictionary with method specific parameters
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
111 @type dict
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
112 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
113 pass
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
114
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
115 def run(self):
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
116 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
117 Public method implementing the main loop of the client.
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
118 """
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
119 try:
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
120 while True:
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
121 try:
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
122 rrdy, wrdy, xrdy = select.select(
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
123 [self.__connection], [], [])
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
124 except (select.error, KeyboardInterrupt, socket.error):
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
125 # just carry on
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
126 continue
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
127
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
128 if self.__connection in rrdy:
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
129 method, params = self.__receiveJson()
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
130 if method is not None:
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
131 if method == "Exit":
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
132 self.__exitClient = True
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
133 else:
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
134 self.handleCall(method, params)
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
135
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
136 if self.__exitClient:
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
137 break
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
138
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
139 except Exception:
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
140 exctype, excval, exctb = sys.exc_info()
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
141 tbinfofile = io.StringIO()
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
142 traceback.print_tb(exctb, None, tbinfofile)
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
143 tbinfofile.seek(0)
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
144 tbinfo = tbinfofile.read()
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
145 del exctb
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
146 self.sendJson("ClientException", {
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
147 "ExceptionType": str(exctype),
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
148 "ExceptionValue": str(excval),
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
149 "Traceback": tbinfo,
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
150 })
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
151
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
152 # Give time to process latest response on server side
241
e7d5da53faac Fixed a bug in the JsonClient.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 210
diff changeset
153 try:
e7d5da53faac Fixed a bug in the JsonClient.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 210
diff changeset
154 self.__connection.shutdown(socket.SHUT_RDWR)
e7d5da53faac Fixed a bug in the JsonClient.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 210
diff changeset
155 self.__connection.close()
e7d5da53faac Fixed a bug in the JsonClient.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 210
diff changeset
156 except (socket.error, OSError):
e7d5da53faac Fixed a bug in the JsonClient.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 210
diff changeset
157 # ignore these; socket might be closed already
e7d5da53faac Fixed a bug in the JsonClient.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 210
diff changeset
158 pass
164
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
159
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
160 def poll(self, waitMethod=""):
164
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
161 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
162 Public method to check and receive one message (if available).
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
163
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
164 @param waitMethod name of a method to wait for
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
165 @type str
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
166 @return dictionary containing the data of the waited for method
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
167 @rtype dict
164
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
168 """
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
169 try:
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
170 if waitMethod:
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
171 rrdy, wrdy, xrdy = select.select(
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
172 [self.__connection], [], [])
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
173 else:
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
174 rrdy, wrdy, xrdy = select.select(
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
175 [self.__connection], [], [], 0)
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
176
164
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
177 if self.__connection in rrdy:
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
178 method, params = self.__receiveJson()
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
179 if method is not None:
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
180 if method == "Exit":
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
181 self.__exitClient = True
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
182 elif method == waitMethod:
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
183 return params
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
184 else:
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
185 self.handleCall(method, params)
164
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
186
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
187 except (select.error, KeyboardInterrupt, socket.error):
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
188 # just ignore these
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
189 pass
164
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
190
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
191 except Exception:
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
192 exctype, excval, exctb = sys.exc_info()
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
193 tbinfofile = io.StringIO()
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
194 traceback.print_tb(exctb, None, tbinfofile)
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
195 tbinfofile.seek(0)
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
196 tbinfo = tbinfofile.read()
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
197 del exctb
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
198 self.sendJson("ClientException", {
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
199 "ExceptionType": str(exctype),
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
200 "ExceptionValue": str(excval),
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
201 "Traceback": tbinfo,
121d426d4ed7 Coded a distributed progress dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 163
diff changeset
202 })
169
fb8a4182f12e Modified the JSON client to allow for synchroneous callbacks.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
203
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 169
diff changeset
204 return None

eric ide

mercurial