Feed the hobgoblins (delint).

jaraco · May 10, 2018 · 5e2307e · 5e2307e
1 parent 985355d
commit 5e2307e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/irc/client.py b/irc/client.py
@@ -346,8 +346,8 @@ def _handle_event(self, connection, event):
         with self.mutex:
             h = self.handlers
             matching_handlers = sorted(
-                h.get("all_events", []) +
-                h.get(event.type, [])
+                h.get("all_events", [])
+                + h.get(event.type, [])
             )
             for handler in matching_handlers:
                 result = handler.callback(connection, event)

diff --git a/irc/server.py b/irc/server.py
@@ -210,7 +210,7 @@ def handle_nick(self, params):
         nick = params
 
         # Valid nickname?
-        if re.search('[^a-zA-Z0-9\-\[\]\'`^{}_]', nick):
+        if re.search(r'[^a-zA-Z0-9\-\[\]\'`^{}_]', nick):
             raise IRCError.from_name('erroneusnickname', ':%s' % nick)
 
         if self.server.clients.get(nick, None) == self: