safe ruff fixes

docs/conf.py

@@ -187,4 +187,4 @@
 html_logo = "images/dls-logo.svg"
 html_favicon = html_logo
 
-numfig = True
+numfig = True

pyproject.toml

@@ -99,6 +99,10 @@ commands =
 [tool.ruff]
 src = ["src", "tests"]
 line-length = 88
+# ignoring line to long for the moment to avoid signficant changes to the code
+lint.ignore = [
+    "E501", # line too long
+]
 lint.select = [
     "B",  # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
     "C4", # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4

src/dls_pmac_control/CSstatus.py

@@ -1,5 +1,4 @@
 #!/bin/env dls-python2.6
-# -*- coding: utf-8 -*-
 
 import sys
 

src/dls_pmac_control/GlobalStatus.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 
 from PyQt5.QtCore import QObject, Qt, pyqtSignal, pyqtSlot

src/dls_pmac_control/axissettings.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from PyQt5.QtWidgets import QDialog, QMessageBox
 

src/dls_pmac_control/commsThread.py

@@ -3,11 +3,13 @@
 import traceback
 from queue import Empty, Queue
 
+from dls_pmaclib.dls_pmacremote import (
+    PmacEthernetInterface,
+    PmacSerialInterface,
+    PPmacSshInterface,
+)
 from PyQt5.QtCore import QCoreApplication, QEvent
 
-from dls_pmaclib.dls_pmacremote import (PmacEthernetInterface,
-                                        PmacSerialInterface, PPmacSshInterface)
-
 
 class CustomEvent(QEvent):
     _data = None
@@ -20,7 +22,7 @@ def data(self):
         return self._data
 
 
-class CommsThread(object):
+class CommsThread:
     def __init__(self, parent):
         self.parent = parent
         self.CSNum = 1
@@ -159,7 +161,7 @@ def updateFunc(self):
                     # PowerBrick channels are zero-indexed
                     cmd = cmd + "BrickLV.Chan[" + str(motorNo - 1) + "].I2tFaultStatus BrickLV.Chan[" + str(motorNo - 1) + "].OverCurrent"
                 else:
-                    # Add a dummy request to keep the request chunks 
+                    # Add a dummy request to keep the request chunks
                     # the same length (p99 always returns zero)
                     cmd = cmd + "m" + str(motorNo) + "90 p99"
             else:

src/dls_pmac_control/energise.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 import re
 import sys

src/dls_pmac_control/login.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from PyQt5.QtWidgets import QDialog
 
 from dls_pmac_control.ui_formLogin import Ui_Login

src/dls_pmac_control/motor.py

@@ -6,28 +6,36 @@
 from os import path
 from queue import Empty
 
+from dls_pmaclib.dls_pmacremote import (
+    PmacEthernetInterface,
+    PmacSerialInterface,
+    PmacTelnetInterface,
+    PPmacSshInterface,
+)
+from dls_pmaclib.dls_pmcpreprocessor import ClsPmacParser
 from PyQt5.QtCore import QEvent, Qt, pyqtSlot
 from PyQt5.QtGui import QIcon, QPixmap
-from PyQt5.QtWidgets import (QApplication, QFileDialog, QLineEdit, QMainWindow,
-                             QMessageBox, QProgressDialog, QTableWidgetItem)
-
-from dls_pmac_control.axissettings import (Axissettingsform,
-                                          PpmacAxissettingsform)
+from PyQt5.QtWidgets import (
+    QApplication,
+    QFileDialog,
+    QLineEdit,
+    QMainWindow,
+    QMessageBox,
+    QProgressDialog,
+    QTableWidgetItem,
+)
+
+from dls_pmac_control.axissettings import Axissettingsform, PpmacAxissettingsform
 from dls_pmac_control.commsThread import CommsThread
 from dls_pmac_control.CSstatus import CSStatusForm, PpmacCSStatusForm
 from dls_pmac_control.energise import Energiseform
 from dls_pmac_control.gather import PmacGatherform
-from dls_pmac_control.GlobalStatus import (GlobalStatusForm,
-                                          PpmacGlobalStatusForm)
+from dls_pmac_control.GlobalStatus import GlobalStatusForm, PpmacGlobalStatusForm
 from dls_pmac_control.login import Loginform
 from dls_pmac_control.ppmacgather import PpmacGatherform
 from dls_pmac_control.status import PpmacStatusform, Statusform
 from dls_pmac_control.ui_formControl import Ui_ControlForm
 from dls_pmac_control.watches import Watchesform
-from dls_pmaclib.dls_pmacremote import (PmacEthernetInterface,
-                                        PmacSerialInterface,
-                                        PmacTelnetInterface, PPmacSshInterface)
-from dls_pmaclib.dls_pmcpreprocessor import ClsPmacParser
 
 from . import __version__
 

src/dls_pmac_control/status.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 import sys
 

src/dls_pmac_control/ui_formAxisSettings.py

@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formAxisSettings.ui'
 #
 # Created by: PyQt5 UI code generator 5.12.2
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formAxisSettings(object):
+class Ui_formAxisSettings:
     def setupUi(self, formAxisSettings):
         formAxisSettings.setObjectName("formAxisSettings")
         formAxisSettings.resize(508, 548)

src/dls_pmac_control/ui_formCSStatus.py

@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'src/dls_pmac_control/formCSStatus.ui'
 #
 # Created by: PyQt5 UI code generator 5.12.2
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formCSStatus(object):
+class Ui_formCSStatus:
     def setupUi(self, formCSStatus):
         formCSStatus.setObjectName("formCSStatus")
         formCSStatus.resize(433, 311)

src/dls_pmac_control/ui_formControl.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formControl.ui'
 #
@@ -9,7 +8,7 @@
 from PyQt5 import QtCore, QtGui, QtWidgets
 
 
-class Ui_ControlForm(object):
+class Ui_ControlForm:
     def setupUi(self, ControlForm):
         ControlForm.setObjectName("ControlForm")
         ControlForm.resize(675, 805)

src/dls_pmac_control/ui_formEnergise.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formEnergise.ui'
 #
@@ -8,10 +7,10 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formEnergise(object):
+class Ui_formEnergise:
     def setupUi(self, formEnergise):
         formEnergise.setObjectName("formEnergise")
         formEnergise.resize(192, 252)

src/dls_pmac_control/ui_formGather.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formGather.ui'
 #
@@ -12,7 +11,7 @@
 from qwt import QwtPlot
 
 
-class Ui_formGather(object):
+class Ui_formGather:
     def setupUi(self, formGather):
         formGather.setObjectName("formGather")
         formGather.resize(608, 429)

src/dls_pmac_control/ui_formGlobalStatus.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formGlobalStatus.ui'
 #
@@ -8,10 +7,10 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formGlobalStatus(object):
+class Ui_formGlobalStatus:
     def setupUi(self, formGlobalStatus):
         formGlobalStatus.setObjectName("formGlobalStatus")
         formGlobalStatus.resize(122, 144)

src/dls_pmac_control/ui_formLogin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formLogin.ui'
 #
@@ -8,10 +7,10 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_Login(object):
+class Ui_Login:
     def setupUi(self, Login):
         Login.setObjectName("Login")
         Login.resize(314, 145)

src/dls_pmac_control/ui_formPpmacAxisSettings.py

@@ -1,15 +1,14 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formPpmacAxisSettings.ui'
 #
 # Created by: PyQt5 UI code generator 5.12.2
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formPpmacAxisSettings(object):
+class Ui_formPpmacAxisSettings:
     def setupUi(self, formPpmacAxisSettings):
         formPpmacAxisSettings.setObjectName("formPpmacAxisSettings")
         formPpmacAxisSettings.resize(580, 688)

src/dls_pmac_control/ui_formPpmacCSStatus.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formPpmacCSStatus.ui'
 #
@@ -8,10 +7,10 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formPpmacCSStatus(object):
+class Ui_formPpmacCSStatus:
     def setupUi(self, formCSStatus):
         formCSStatus.setObjectName("formCSStatus")
         formCSStatus.setGeometry(QtCore.QRect(0, 0, 433, 311))

src/dls_pmac_control/ui_formStatus.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formStatus.ui'
 #
@@ -8,10 +7,10 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formStatus(object):
+class Ui_formStatus:
     def setupUi(self, formStatus):
         formStatus.setObjectName("formStatus")
         formStatus.resize(99, 189)

src/dls_pmac_control/ui_formWatches.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 # Form implementation generated from reading ui file 'dls_pmac_control/formWatches.ui'
 #
@@ -8,10 +7,10 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5 import QtCore, QtWidgets
 
 
-class Ui_formWatches(object):
+class Ui_formWatches:
     def setupUi(self, formWatches):
         formWatches.setObjectName("formWatches")
         formWatches.resize(905, 585)

src/dls_pmac_control/watches.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 import re
 
@@ -115,7 +114,7 @@ def applyEditWatch(self):
             self.updateCurrentWatch()
             self.lneEditValue.setText("")
             self.panelEditWatch.setEnabled(False)
-        except (ValueError, IOError) as e:
+        except (OSError, ValueError) as e:
             self.lneEditValue.setText("")
             self.panelEditWatch.setEnabled(False)
             QMessageBox.information(self, "Cannot change value", str(e))
@@ -162,7 +161,7 @@ def _sendPMACCommand(self, command):
         # Get response from PMAC; the 2nd returned boolean indicates absence of timeout
         (s, wasNoTimeout) = self.pmac.sendCommand(command)
         if not wasNoTimeout:
-            raise IOError("Connection to PMAC timed out")
+            raise OSError("Connection to PMAC timed out")
 
         # Check whether PMAC doesn't reply with an ERRxx type response
         matchObject = re.match(r"^\x07(ERR\d+)\r$", s)

tests/test_axissettings.py

@@ -1,6 +1,6 @@
 import unittest
+from unittest.mock import Mock, patch
 
-from mock import Mock, patch
 from PyQt5.QtCore import Qt
 from PyQt5.QtTest import QTest
 from PyQt5.QtWidgets import QMainWindow

tests/test_commsthread.py

@@ -1,6 +1,6 @@
 import unittest
+from unittest.mock import Mock, patch
 
-from mock import Mock, patch
 from PyQt5.QtWidgets import QMainWindow
 
 from dls_pmac_control.commsThread import CommsThread

tests/test_csstatus.py

@@ -1,7 +1,7 @@
 import unittest
 from os import path
+from unittest.mock import Mock, patch
 
-from mock import Mock, patch
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QPixmap
 from PyQt5.QtTest import QTest

tests/test_energise.py

@@ -1,6 +1,6 @@
 import unittest
+from unittest.mock import Mock, patch
 
-from mock import Mock, patch
 from PyQt5.QtWidgets import QCheckBox, QMainWindow
 
 from dls_pmac_control.energise import Energiseform

tests/test_gather.py

@@ -1,7 +1,7 @@
 import os
 import unittest
+from unittest.mock import Mock, patch
 
-from mock import Mock, patch
 from PyQt5.QtCore import QPoint, Qt
 from PyQt5.QtTest import QTest
 from PyQt5.QtWidgets import QMainWindow

tests/test_gatherchannel.py

@@ -1,6 +1,6 @@
 import unittest
+from unittest.mock import Mock
 
-from mock import Mock
 from PyQt5.QtWidgets import QMainWindow
 from qwt import QwtPlotCurve