Mercurial Repositories > eric / file diff

--- a/src/eric7/Network/IRC/IrcWidget.py	Fri Jan 05 10:53:18 2024 +0100
+++ b/src/eric7/Network/IRC/IrcWidget.py	Fri Jan 05 16:04:03 2024 +0100
@@ -7,6 +7,7 @@
 Module implementing the IRC window.
 """
 
+import enum
 import logging
 import re
 
@@ -36,6 +37,16 @@
 from .Ui_IrcWidget import Ui_IrcWidget
 
 
+class IrcConnectionState(enum.Enum):
+    """
+    Class defining the connection states.
+    """
+
+    Disconnected = 1
+    Connected = 2
+    Connecting = 3
+
+
 class IrcWidget(QWidget, Ui_IrcWidget):
     """
     Class implementing the IRC window.
@@ -45,11 +56,6 @@
 
     autoConnected = pyqtSignal()
 
-    # TODO: change this to an enum
-    ServerDisconnected = 1
-    ServerConnected = 2
-    ServerConnecting = 3
-
     def __init__(self, parent=None):
         """
         Constructor
@@ -87,7 +93,7 @@
         self.__server = None
         self.__registering = False
 
-        self.__connectionState = IrcWidget.ServerDisconnected
+        self.__connectionState = IrcConnectionState.Disconnected
         self.__sslErrorLock = False
 
         self.__buffer = ""
@@ -216,7 +222,7 @@
                         self.__socket.readyRead.connect(self.__readyRead)
                         self.__socket.errorOccurred.connect(self.__tcpError)
 
-                        self.__connectionState = IrcWidget.ServerConnecting
+                        self.__connectionState = IrcConnectionState.Connecting
                         if useSSL:
                             self.networkWidget.addServerMessage(
                                 self.tr("Info"),
@@ -587,7 +593,7 @@
                 self.__socket.deleteLater()
             self.__socket = None
 
-            self.__connectionState = IrcWidget.ServerDisconnected
+            self.__connectionState = IrcConnectionState.Disconnected
             self.__sslErrorLock = False
 
     def __readyRead(self):
@@ -850,7 +856,7 @@
 
         if code == 1:
             # register with services after the welcome message
-            self.__connectionState = IrcWidget.ServerConnected
+            self.__connectionState = IrcConnectionState.Connected
             self.__registerWithServices()
             self.networkWidget.setRegistered(True)
             QTimer.singleShot(1000, self.__autoJoinChannels)
@@ -907,7 +913,7 @@
                         """ waiting for user response to an SSL error."""
                     ).format(self.__server.getName(), self.__server.getPort()),
                 )
-                self.__connectionState = IrcWidget.ServerDisconnected
+                self.__connectionState = IrcConnectionState.Disconnected
         elif error == QAbstractSocket.SocketError.HostNotFoundError:
             self.networkWidget.addErrorMessage(
                 self.tr("Socket Error"),
@@ -976,7 +982,7 @@
                         """ were accepted by you."""
                     ).format(self.__server.getName(), self.__server.getPort()),
                 )
-            if self.__connectionState == IrcWidget.ServerConnecting:
+            if self.__connectionState == IrcConnectionState.Connecting:
                 self.__socket.ignoreSslErrors()
 
     def __setUserPrivilegePrefix(self, prefix1, prefix2):