From 785fec1bbdbb2c267ee43a84323447db045fa53e Mon Sep 17 00:00:00 2001
From: artem30801 <artem30801@gmail.com>
Date: Tue, 26 Mar 2019 02:57:23 +0000
Subject: [PATCH 1/2] parent folder

---
 Drone/client.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Drone/client.py b/Drone/client.py
index f0f8412..be0f0fb 100644
--- a/Drone/client.py
+++ b/Drone/client.py
@@ -7,6 +7,10 @@ import logging
 import ConfigParser
 from contextlib import closing
 
+import os,sys,inspect
+current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+parent_dir = os.path.dirname(current_dir)
+sys.path.insert(0, parent_dir) 
 
 from messaging_lib import Message
 random.seed()
@@ -151,4 +155,4 @@ class Client:
 if __name__ == "__main__":
     client = Client()
     client.reconnect()
-    client.mainloop()
\ No newline at end of file
+    client.mainloop()

From 95d9405849903fe23fa9a24dec242800bfce8bae Mon Sep 17 00:00:00 2001
From: Artem <a@batalov.tk>
Date: Tue, 9 Apr 2019 00:12:01 +0700
Subject: [PATCH 2/2] rw in server

---
 Server/server.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Server/server.py b/Server/server.py
index 52bcfdf..40f4d82 100644
--- a/Server/server.py
+++ b/Server/server.py
@@ -116,7 +116,7 @@ class Server:
         logging.info("Client processor (selector) thread started!")
         self.server_socket.listen()
         self.server_socket.setblocking(False)
-        self.sel.register(self.server_socket, selectors.EVENT_READ, data=None)
+        self.sel.register(self.server_socket, selectors.EVENT_READ | selectors.EVENT_WRITE, data=None)
 
         while self.client_processor_thread_running.is_set():
             events = self.sel.select(timeout=None)
@@ -275,6 +275,8 @@ class Client:
         self.socket = client_socket
         self.addr = client_addr
 
+        self._set_selector_events_mask('rw')
+
         self.connected = True
 
         if self.copter_id is None:
@@ -319,7 +321,7 @@ class Client:
             if (not self._send_buffer) and self._send_queue:
                 message = self._send_queue.popleft()
                 self._send_buffer += message
-                self._set_selector_events_mask('rw')
+                # self._set_selector_events_mask('rw')
 
     def process_received(self):
         if self._received_queue:
@@ -363,8 +365,8 @@ class Client:
 
     def write(self):
         self._write()
-        if not (self._send_buffer and self._send_queue):
-            self._set_selector_events_mask("r")
+        # if not (self._send_buffer and self._send_queue):
+        #     self._set_selector_events_mask("r")
 
     def _read(self):
         try: