Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-27 05:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Moved some error handling to a different place.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-02-08 09:26:21 +00:00
parent 0ba2815746
commit ca4a8dceef
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/User.py
View File

@ -178,11 +178,6 @@ class User(callbacks.Privmsg):
if not ircutils.isUserHostmask(hostmask):
irc.error('That\'s not a valid hostmask.')
return
s = hostmask.translate(string.ascii, '!@*?')
if len(s) < 10:
s = 'Hostmask must contain more than 10 non-wildcard characters.'
irc.error(s)
return
try:
id = ircdb.users.getUserId(name)
user = ircdb.users.getUser(id)
@ -197,7 +192,11 @@ class User(callbacks.Privmsg):
except KeyError:
pass
if user.checkHostmask(msg.prefix) or user.checkPassword(password):
user.addHostmask(hostmask)
try:
user.addHostmask(hostmask)
except ValueError, e:
irc.error(str(e))
return
ircdb.users.setUser(id, user)
irc.replySuccess()
else: