client.py

@@ -60,9 +60,9 @@ if __name__ == "__main__":
                 read_msg(s)
         except ConnectionRefusedError:
             print("Could not connect to the server!")
-        finally:
-            s.close()
 
 
     except KeyboardInterrupt:
         print("Exit with CTRL+C")
+    finally:
+        pass

server.py

@@ -33,33 +33,24 @@ def handle_connection(conn):
                     connections.remove(conn)
                     break
 
-def handle_new_connections():
+
+if __name__ == "__main__":
     hostname = socket.gethostname()
     IPAddr = socket.gethostbyname(hostname)
-    try:
+
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        try:
             s.bind((HOST, PORT))
             print(f"Server {hostname} on ip {IPAddr}")
             while run:
                 conn=Connection()
                 s.listen()
-                ready_to_read, _, _ = select.select([s], [], [], 1.0)
+                conn.sock, conn.addr = s.accept()
-                if ready_to_read:
+                connections.append(conn)
-                    conn.sock, conn.addr = s.accept()
+                threading.Thread(target=handle_connection, args=(conn,)).start()
-                    connections.append(conn)
+        except KeyboardInterrupt:
-                    threading.Thread(target=handle_connection, args=(conn,)).start()
+            run = False
-    finally:
+            print("Shutdown server")
-        s.close()
+        finally:
-
+            s.close()
-
-if __name__ == "__main__":
-    threading.Thread(target=handle_new_connections).start()
-    try:
-        print("Press Enter or CTRL + C to stop server")
-        input()
-    except KeyboardInterrupt:
-        pass
-    finally:
-        run = False
-        print("Shutdown server")