Merge remote-tracking branch 'origin/v3.6'

client-py3/full/src/UDSClient.py

@@ -41,11 +41,11 @@ import typing
 from PyQt5 import QtCore, QtWidgets, QtGui
 from PyQt5.QtCore import QSettings
 
-from uds.rest import RestApi, RetryException, InvalidVersion, UDSException
+from uds.rest import RestApi, RetryException, InvalidVersion
 
 # Just to ensure there are available on runtime
-from uds.forward import forward as ssh_forward # type: ignore
-from uds.tunnel import forward as tunnel_forwards  # type: ignore
+from uds.forward import forward as ssh_forward  # type: ignore  # pylint: disable=unused-import
+from uds.tunnel import forward as tunnel_forwards  # type: ignore  # pylint: disable=unused-import
 
 from uds.log import logger
 from uds import tools
@@ -55,7 +55,6 @@ from UDSWindow import Ui_MainWindow
 
 
 class UDSClient(QtWidgets.QMainWindow):
-
     ticket: str = ''
     scrambler: str = ''
     withError = False
@@ -149,7 +148,7 @@ class UDSClient(QtWidgets.QMainWindow):
             webbrowser.open(e.downloadUrl)
             self.closeWindow()
             return
-        except Exception as e:
+        except Exception as e:  # pylint: disable=broad-exception-caught
             self.showError(e)
             self.closeWindow()
             return
@@ -168,7 +167,9 @@ class UDSClient(QtWidgets.QMainWindow):
             # self.hide()
             self.closeWindow()
 
-            exec(script, globals(), {'parent': self, 'sp': params})
+            exec(
+                script, globals(), {'parent': self, 'sp': params}
+            )  # pylint: disable=exec-used
 
             # Execute the waiting tasks...
             threading.Thread(target=endScript).start()
@@ -177,7 +178,7 @@ class UDSClient(QtWidgets.QMainWindow):
             self.ui.info.setText(str(e) + ', retrying access...')
             # Retry operation in ten seconds
             QtCore.QTimer.singleShot(10000, self.getTransportData)
-        except Exception as e:
+        except Exception as e:  # pylint: disable=broad-exception-caught
             logger.exception('Error getting transport data')
             self.showError(e)
 
@@ -195,27 +196,27 @@ def endScript():
     try:
         # Remove early stage files...
         tools.unlinkFiles(early=True)
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         logger.debug('Unlinking files on early stage: %s', e)
 
     # After running script, wait for stuff
     try:
         logger.debug('Wating for tasks to finish...')
         tools.waitForTasks()
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         logger.debug('Watiting for tasks to finish: %s', e)
 
     try:
         logger.debug('Unlinking files')
         tools.unlinkFiles(early=False)
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         logger.debug('Unlinking files on later stage: %s', e)
 
     # Removing
     try:
         logger.debug('Executing threads before exit')
         tools.execBeforeExit()
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         logger.debug('execBeforeExit: %s', e)
 
     logger.debug('endScript done')
@@ -306,7 +307,7 @@ def minimal(api: RestApi, ticket: str, scrambler: str):
             + '\n\nPlease, retry again in a while.',
             QtWidgets.QMessageBox.Ok,
         )
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         # logger.exception('Got exception on getTransportData')
         QtWidgets.QMessageBox.critical(
             None,  # type: ignore
@@ -353,8 +354,17 @@ def main(args: typing.List[str]):
             sys.exit(0)
 
         logger.debug('URI: %s', uri)
+        # Shows error if using http (uds:// ) version, not supported anymore
+        if uri[:6] == 'uds://':
+            QtWidgets.QMessageBox.critical(
+                None,  # type: ignore
+                'Notice',
+                f'UDS Client Version {VERSION} does not support HTTP protocol Anymore.',
+                QtWidgets.QMessageBox.Ok,
+            )
+            sys.exit(1)
         if uri[:6] != 'uds://' and uri[:7] != 'udss://':
-            raise Exception()
+            raise Exception('Not supported protocol')
 
         ssl = uri[3] == 's'
         host, ticket, scrambler = uri.split('//')[1].split('/')  # type: ignore
@@ -365,12 +375,12 @@ def main(args: typing.List[str]):
             ticket,
             scrambler,
         )
-    except Exception:
+    except Exception:  # pylint: disable=broad-except
         logger.debug('Detected execution without valid URI, exiting')
         QtWidgets.QMessageBox.critical(
             None,  # type: ignore
             'Notice',
-            'UDS Client Version {}'.format(VERSION),
+            f'UDS Client Version {VERSION}',
             QtWidgets.QMessageBox.Ok,
         )
         sys.exit(1)
@@ -395,7 +405,7 @@ def main(args: typing.List[str]):
         exitVal = app.exec()
         logger.debug('Execution finished correctly')
 
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         logger.exception('Got an exception executing client:')
         exitVal = 128
         QtWidgets.QMessageBox.critical(
@@ -405,5 +415,6 @@ def main(args: typing.List[str]):
     logger.debug('Exiting')
     sys.exit(exitVal)
 
+
 if __name__ == "__main__":
     main(sys.argv)