Commits

Jason R. Coombs committed e2ecb1c

Created new exceptions, still ValueErrors, for lengthy messages and carriage returns

  • Participants
  • Parent commits e558ce1
  • Tags 3.6

Comments (0)

Files changed (2)

+3.6
+===
+
+* Created two new exceptions in `irc.client`: `MessageTooLong` and
+  `InvalidCharacters`.
+* Use explicit exceptions instead of ValueError when sending data.
+
 3.5
 ===
 

File irc/client.py

 class IRCError(Exception):
     "An IRC exception"
 
+class InvalidCharacters(ValueError):
+    "Invalid characters were encountered in the message"
+
+class MessageTooLong(ValueError):
+    "Message is too long"
+
 
 class IRC(object):
     """Class that handles one or several IRC server connections.
         # The string should not contain any carriage return other than the
         # one added here.
         if '\n' in string:
-            raise ValueError("Carriage returns not allowed in privmsg(text)")
+            raise InvalidCharacters(
+                "Carriage returns not allowed in privmsg(text)")
         bytes = string.encode('utf-8') + b'\r\n'
         # According to the RFC http://tools.ietf.org/html/rfc2812#page-6,
         # clients should not transmit more than 512 bytes.
         if len(bytes) > 512:
-            raise ValueError("Messages limited to 512 bytes including CR/LF")
+            raise MessageTooLong(
+                "Messages limited to 512 bytes including CR/LF")
         if self.socket is None:
             raise ServerNotConnectedError("Not connected.")
         sender = getattr(self.socket, 'write', self.socket.send)