Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-26 20:52:45 +01:00
Code Issues Projects Releases Wiki Activity

Updates and tweaks to some ircutils functions.

Browse Source 
(cherry picked from commit 6135a88741)

Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
This commit is contained in:
Jeremy Fincher 2010-05-18 12:48:36 -05:00 committed by Daniel Folkinshteyn
parent 1a228b3e7d
commit df2c6c2650
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ircutils.py
View File

@ -48,14 +48,10 @@ def debug(s, *args):
"""Prints a debug string. Most likely replaced by our logging debug.""" """Prints a debug string. Most likely replaced by our logging debug."""
print '***', s % args print '***', s % args
userHostmaskRe = re.compile(r'^\S+!\S+@\S+$')
def isUserHostmask(s): def isUserHostmask(s):
"""Returns whether or not the string s is a valid User hostmask.""" """Returns whether or not the string s is a valid User hostmask."""
p1 = s.find('!') return userHostmaskRe.match(s) is not None
p2 = s.find('@')
if p1 < p2-1 and p1 >= 1 and p2 >= 3 and len(s) > p2+1:
return True
else:
return False
def isServerHostmask(s): def isServerHostmask(s):
"""s => bool """s => bool
@ -66,19 +62,19 @@ def nickFromHostmask(hostmask):
"""hostmask => nick """hostmask => nick
Returns the nick from a user hostmask.""" Returns the nick from a user hostmask."""
assert isUserHostmask(hostmask) assert isUserHostmask(hostmask)
return hostmask.split('!', 1)[0] return splitHostmask(hostmask)[0]
def userFromHostmask(hostmask): def userFromHostmask(hostmask):
"""hostmask => user """hostmask => user
Returns the user from a user hostmask.""" Returns the user from a user hostmask."""
assert isUserHostmask(hostmask) assert isUserHostmask(hostmask)
return hostmask.split('!', 1)[1].split('@', 1)[0] return splitHostmask(hostmask)[1]
def hostFromHostmask(hostmask): def hostFromHostmask(hostmask):
"""hostmask => host """hostmask => host
Returns the host from a user hostmask.""" Returns the host from a user hostmask."""
assert isUserHostmask(hostmask) assert isUserHostmask(hostmask)
return hostmask.split('@', 1)[1] return splitHostmask(hostmask)[2]
def splitHostmask(hostmask): def splitHostmask(hostmask):
"""hostmask => (nick, user, host) """hostmask => (nick, user, host)
@ -86,13 +82,13 @@ def splitHostmask(hostmask):
assert isUserHostmask(hostmask) assert isUserHostmask(hostmask)
nick, rest = hostmask.split('!', 1) nick, rest = hostmask.split('!', 1)
user, host = rest.split('@', 1) user, host = rest.split('@', 1)
return (nick, user, host) return (intern(nick), intern(user), intern(host))
def joinHostmask(nick, ident, host): def joinHostmask(nick, ident, host):
"""nick, user, host => hostmask """nick, user, host => hostmask
Joins the nick, ident, host into a user hostmask.""" Joins the nick, ident, host into a user hostmask."""
assert nick and ident and host assert nick and ident and host
return '%s!%s@%s' % (nick, ident, host) return intern('%s!%s@%s' % (nick, ident, host))
_rfc1459trans = string.maketrans(string.ascii_uppercase + r'\[]~', _rfc1459trans = string.maketrans(string.ascii_uppercase + r'\[]~',
string.ascii_lowercase + r'|{}^') string.ascii_lowercase + r'|{}^')