summaryrefslogtreecommitdiffstats
path: root/module/remote
diff options
context:
space:
mode:
Diffstat (limited to 'module/remote')
-rw-r--r--module/remote/ClientHandler.py7
-rw-r--r--module/remote/ClientSocket.py7
-rw-r--r--module/remote/RequestHandler.py2
-rw-r--r--module/remote/RequestObject.py1
-rw-r--r--module/remote/SocketServer.py1
5 files changed, 5 insertions, 13 deletions
diff --git a/module/remote/ClientHandler.py b/module/remote/ClientHandler.py
index cc06bd21a..248725ccf 100644
--- a/module/remote/ClientHandler.py
+++ b/module/remote/ClientHandler.py
@@ -20,9 +20,4 @@ class ClientHandler(RequestHandler):
def proceed(self, data):
obj = self.decrypt(data)
- self.client.data_arrived(obj)
-
- #if obj.function == "get_downloads":
- # self.client.show_links(obj.response)
-
- return self.encrypt(obj)
+ self.client.data_arrived(obj) \ No newline at end of file
diff --git a/module/remote/ClientSocket.py b/module/remote/ClientSocket.py
index 68e6ee884..4efeaf3ab 100644
--- a/module/remote/ClientSocket.py
+++ b/module/remote/ClientSocket.py
@@ -7,10 +7,9 @@ socket for connecting to the core's server
"""
import asynchat
-import socket
import asyncore
+import socket
import threading
-import time
from ClientHandler import ClientHandler
from RequestObject import RequestObject
@@ -55,9 +54,7 @@ class ClientSocket(asynchat.async_chat):
self.data += data
def found_terminator(self):
- obj = self.handler.proceed(self.data)
- #self.push(obj+"\n")
- print "data arrived"
+ self.handler.proceed(self.data)
self.data = ""
def push_obj(self, obj):
diff --git a/module/remote/RequestHandler.py b/module/remote/RequestHandler.py
index dd4fdeb5f..f7623d27b 100644
--- a/module/remote/RequestHandler.py
+++ b/module/remote/RequestHandler.py
@@ -28,7 +28,7 @@ class RequestHandler:
if obj.command == "exec":
func = getattr(self.core, obj.function)
- obj.response = func( * obj.args)
+ obj.response = func(*obj.args)
else:
obj.response = "error happend"
diff --git a/module/remote/RequestObject.py b/module/remote/RequestObject.py
index 86e803e9c..7080a6faf 100644
--- a/module/remote/RequestObject.py
+++ b/module/remote/RequestObject.py
@@ -6,7 +6,6 @@ authored by: RaNaN
represents the object for interaction
"""
-
class RequestObject(object):
def __init__(self):
self.version = 0
diff --git a/module/remote/SocketServer.py b/module/remote/SocketServer.py
index c9979adb8..c519d8a3b 100644
--- a/module/remote/SocketServer.py
+++ b/module/remote/SocketServer.py
@@ -10,6 +10,7 @@ import asynchat
import asyncore
import socket
import threading
+
from RequestHandler import RequestHandler