Refactored to be a workable module

Author: benwjhack

python-message/__init__.py

@@ -0,0 +1 @@
+from simpleprotocol import LOG, simpleServer, simpleProtocol

message.py renamed to python-message/message.py

@@ -28,7 +28,7 @@ def decode(self, message):
 
 	def get(self):
 		result = self.decode(self.socket.readLine())
-		if self.LOG: print result
+		if self.LOG: print(result)
 		return result
 
 	def send(self, code, subcode=0, param=[]):

python-message/simpleprotocol.py

@@ -0,0 +1,29 @@
+import .socketwrapper
+import .message
+
+LOG = False
+
+class SimpleServer():
+
+    def __init__(self, port):
+        self.port = port
+        self.socket = socketwrapper.ServerSocket(port=port)
+
+    def accept(self):
+        return SimpleSocket(self.socket.getClientObject())
+
+class SimpleProtocol():
+
+    def __init__(self, port):
+        self.socket = socketwrapper.ClientSocket(port=port)
+        self.message = message.Message(socket=self.socket)
+
+    def __init__(self, socket):
+        self.socket = socket
+        self.message = message.Message(socket=self.socket)
+
+    def send(self, *args, **kwargs):
+        self.message.send(*args, **kwargs)
+
+    def get(self, *args, **kwargs):
+        self.message.get(*args, **kwargs)

sockets.py renamed to python-message/socketwrapper.py

@@ -8,15 +8,12 @@ def __init__(self, ip='localhost', port=10000):
 		self.sock.bind(self.server_address)
 		self.sock.listen(1)
 
-	def getClient(self):
+	def accept(self):
 		connection, client_address = self.sock.accept()
 		return [connection, client_address]
 
 	def getClientObject(self):
-		return self.ServerSocketHandler(*self.getClient())
-	
-	def startThreadedFunctionWithClient(self, function):
-		pass
+		return self.ServerSocketHandler(*self.accept())
 
 	class ServerSocketHandler():