Merge lp:~stefanor/ibid/irc-password-789187 into lp:ibid

Proposed by Stefano Rivera on 2011-10-30
Status: Merged
Approved by: Max Rabkin on 2011-11-09
Approved revision: 1038
Merged at revision: 1039
Proposed branch: lp:~stefanor/ibid/irc-password-789187
Merge into: lp:ibid
Diff against target: 20 lines (+3/-0)
1 file modified
ibid/source/irc.py (+3/-0)
To merge this branch: bzr merge lp:~stefanor/ibid/irc-password-789187
Reviewer Review Type Date Requested Status
Max Rabkin 2011-10-30 Approve on 2011-11-09
Keegan Carruthers-Smith Approve on 2011-10-31
Review via email: mp+80763@code.launchpad.net

Commit message

Add the option of specifying an IRC server password.

Description of the change

Untested, but seems straightforward. Anyone know a server to test it against? (I'm not about to set one up just for this...

To post a comment you must log in.

I have not tested this either, but your diff seems to agree with the twisted documentation on IRCClient.

review: Approve

Ok tested on a local irc server, and it works.

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

Max Rabkin (max-rabkin) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ibid/source/irc.py'
--- ibid/source/irc.py 2011-02-09 10:55:45 +0000
+++ ibid/source/irc.py 2011-10-30 20:49:24 +0000
@@ -28,6 +28,8 @@
28 def connectionMade(self):28 def connectionMade(self):
29 self.nickname = self.factory.nick.encode('utf-8')29 self.nickname = self.factory.nick.encode('utf-8')
30 self.realname = self.factory.realname.encode('utf-8')30 self.realname = self.factory.realname.encode('utf-8')
31 if self.factory.password is not None:
32 self.password = self.factory.password.encode('utf-8')
3133
32 irc.IRCClient.connectionMade(self)34 irc.IRCClient.connectionMade(self)
3335
@@ -312,6 +314,7 @@
312 server = Option('server', 'Server hostname')314 server = Option('server', 'Server hostname')
313 nick = Option('nick', 'IRC nick', ibid.config['botname'])315 nick = Option('nick', 'IRC nick', ibid.config['botname'])
314 realname = Option('realname', 'Full Name', ibid.config['botname'])316 realname = Option('realname', 'Full Name', ibid.config['botname'])
317 password = Option('password', 'Connection password', None)
315 modes = Option('modes', 'User modes to set')318 modes = Option('modes', 'User modes to set')
316 channels = ListOption('channels', 'Channels to autojoin', [])319 channels = ListOption('channels', 'Channels to autojoin', [])
317 ping_interval = FloatOption('ping_interval', 'Seconds idle before sending a PING', 60)320 ping_interval = FloatOption('ping_interval', 'Seconds idle before sending a PING', 60)

Subscribers

People subscribed via source and target branches

to all changes: