remove more redundant try

server/netwrapper.py

@@ -111,27 +111,23 @@ class NetWrapper:
         self.cipherkey = (hasher.hexdigest()[:32]).encode('UTF-8')
 
     def login(self) -> bool:
-        try:
+        status, msg = self.network.receive_msg(blocking=True)
-            status, msg = self.network.receive_msg(blocking=True)
+        if not status:
-            if not status:
+            raise Exception('Network error during connection.')
-                raise Exception('Network error during connection.')
+        cleartext = self.recieveEncryptedMessage(msg, "AUT").decode('UTF-8')
-            cleartext = self.recieveEncryptedMessage(msg, "AUT").decode('UTF-8')
+        if cleartext == "ERROR":
-            if cleartext == "ERROR":
-                return False
-            else:
-                plaintext = cleartext.split(' ')
-            self.homeDirectory = self.authenticationInstance.login(plaintext[1], plaintext[2])
-            linsuccess = (not (len(plaintext) != 3 or plaintext[0] != "LIN" or plaintext[
-                1] != self.currentUser)) and self.homeDirectory
-            if linsuccess:
-                message = "OK".encode('UTF-8')
-            else:
-                message = "ERROR".encode('UTF-8')
-            self.sendTypedMessage(message, "AUT")
-            return linsuccess
-        except Exception:
-            print("Login failed")
             return False
+        else:
+            plaintext = cleartext.split(' ')
+        self.homeDirectory = self.authenticationInstance.login(plaintext[1], plaintext[2])
+        linsuccess = (not (len(plaintext) != 3 or plaintext[0] != "LIN" or plaintext[
+            1] != self.currentUser)) and self.homeDirectory
+        if linsuccess:
+            message = "OK".encode('UTF-8')
+        else:
+            message = "ERROR".encode('UTF-8')
+        self.sendTypedMessage(message, "AUT")
+        return linsuccess
 
     def initClientConnection(self, msg: bytes) -> bytes:
         print('A client is trying to connect')

server/server.py

@@ -35,7 +35,6 @@ class Server:
             self.networkInstance.sendMessage("OK".encode('UTF-8'))
             return None
         elif command == "LINERROR":
-            self.networkInstance.sendMessage("ERROR".encode('UTF-8'))
             return None
         elif command == "ERROR":
             self.networkInstance.sendMessage("ERROR".encode('UTF-8'))