From 74180cb10363b4260cfa989930cfce9f6abe662c Mon Sep 17 00:00:00 2001
From: jesopo
Date: Tue, 2 Oct 2018 17:59:33 +0100
Subject: Simplify Utils.seperate_hostmask

---
 src/Utils.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Utils.py b/src/Utils.py
index 2f1782bc..9fcf0883 100644
--- a/src/Utils.py
+++ b/src/Utils.py
@@ -53,14 +53,8 @@ class IRCHostmask(object):
 
 def seperate_hostmask(hostmask):
     hostmask = remove_colon(hostmask)
-    first_delim = hostmask.find("!")
-    second_delim = hostmask.find("@")
-    nickname, username, hostname = hostmask, None, None
-    if first_delim > -1 and second_delim > first_delim:
-        nickname, username = hostmask.split("!", 1)
-        username, hostname = username.split("@", 1)
-    elif second_delim > -1:
-        nickname, hostname = hostmask.split("@", 1)
+    nickname, _, username = hostmask.partition("!")
+    username, _, hostname = username.partition("@")
     return IRCHostmask(nickname, username, hostname, hostmask)
 
 def get_url(url, **kwargs):
-- 
cgit v1.3.1-10-gc9f91