From 8ff5da24c21de78bd4dfcb9942d4417c4208d511 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Fri, 14 Nov 2014 08:54:34 +0300 Subject: [PATCH] Begin refactoring --- pym/consolegui/application/TrayIcon.py | 3 +-- pym/consolegui/application/mainframe.py | 3 +++ pym/consolegui/application/pid_information.py | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pym/consolegui/application/TrayIcon.py b/pym/consolegui/application/TrayIcon.py index 2f4891a..25d6d62 100644 --- a/pym/consolegui/application/TrayIcon.py +++ b/pym/consolegui/application/TrayIcon.py @@ -275,8 +275,7 @@ class TrayIcon (QtGui.QSystemTrayIcon): """ pid = str(self._parent.sys_update_pid) client_obj = self._parent.localhost_ClientObj - pids = map(str, client_list_pid(client_obj.client)) - client_pid_info(client_obj, client_obj.client, 0) + pids = map(str, client_pid_info(client_obj, client_obj.client, 0)) if self._parent.localhost_ClientObj: if pid and pid in client_obj.process_dict and pid in pids: return pid diff --git a/pym/consolegui/application/mainframe.py b/pym/consolegui/application/mainframe.py index d89c2fb..dc42ef2 100755 --- a/pym/consolegui/application/mainframe.py +++ b/pym/consolegui/application/mainframe.py @@ -2238,12 +2238,15 @@ class MainFrame(QtGui.QWidget): sid = int(self.ClientObj.sid) # call method on server try: + import time + print time.time() if self.param_object: meth_result_temp = self.ClientObj.client.service[0] \ [self.method_name](sid, self.param_object) else: meth_result_temp = self.ClientObj.client.service[0] \ [self.method_name](sid) + print time.time() except Exception, e: self.calling_error = True msg = e.message diff --git a/pym/consolegui/application/pid_information.py b/pym/consolegui/application/pid_information.py index 31fc0cd..999086a 100755 --- a/pym/consolegui/application/pid_information.py +++ b/pym/consolegui/application/pid_information.py @@ -63,9 +63,9 @@ def gen_pid_ls(client): try: list_pid = client_list_pid(client) if not list_pid: - return 0 + return [] except: - return 0 + return [] return list_pid def pid_inf(ClientObj, client, sid, pids): @@ -111,6 +111,7 @@ def client_pid_info(ClientObj, client, pid): pid_ls = gen_pid_ls(client) if pid_ls: pid_inf(ClientObj, client, sid, pid_ls) + return pid_ls # except: # show_msg("Error get process information") # return 1