mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-02-17 14:10:41 +01:00
Optimized IrcMsg.__str__ slightly.
This commit is contained in:
parent
5f7656c781
commit
2c87c183b2
@ -111,7 +111,8 @@ class IrcMsg(object):
|
|||||||
else:
|
else:
|
||||||
(nick, user, host) = ('', '', '')
|
(nick, user, host) = ('', '', '')
|
||||||
self._prefix = prefix
|
self._prefix = prefix
|
||||||
self._nick = ircutils.nick(nick)
|
## self._nick = ircutils.nick(nick)
|
||||||
|
self._nick = nick
|
||||||
self._user = user
|
self._user = user
|
||||||
self._host = host
|
self._host = host
|
||||||
self._command = command
|
self._command = command
|
||||||
@ -132,17 +133,25 @@ class IrcMsg(object):
|
|||||||
return self._str
|
return self._str
|
||||||
ret = ''
|
ret = ''
|
||||||
if self.prefix:
|
if self.prefix:
|
||||||
ret = ':%s %s' % (self.prefix, self.command)
|
|
||||||
else:
|
|
||||||
ret = self.command
|
|
||||||
if self.args:
|
|
||||||
if len(self.args) > 1:
|
if len(self.args) > 1:
|
||||||
ret = '%s %s :%s\r\n' % (ret, ' '.join(self.args[:-1]),
|
ret = ':%s %s %s :%s\r\n' % \
|
||||||
self.args[-1])
|
(self.prefix, self.command,
|
||||||
|
' '.join(self.args[:-1]), self.args[-1])
|
||||||
else:
|
else:
|
||||||
ret = '%s :%s\r\n' % (ret, self.args[0])
|
if self.args:
|
||||||
|
ret = ':%s %s :%s\r\n' % \
|
||||||
|
(self.prefix, self.command, self.args[0])
|
||||||
|
else:
|
||||||
|
ret = ':%s %s\r\n' % (self.prefix, self.command)
|
||||||
else:
|
else:
|
||||||
ret = ret + '\r\n'
|
if len(self.args) > 1:
|
||||||
|
ret = '%s %s :%s\r\n' % \
|
||||||
|
(self.command, ' '.join(self.args[:-1]), self.args[-1])
|
||||||
|
else:
|
||||||
|
if self.args:
|
||||||
|
ret = '%s :%s\r\n' % (self.command, self.args[0])
|
||||||
|
else:
|
||||||
|
ret = '%s\r\n' % self.command
|
||||||
self._str = ret
|
self._str = ret
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user