From 4959423fd1a611b7748a5de11f9aae737009f86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Dal=C3=A9n?= <dalen@spotify.com>
Date: Wed, 31 Oct 2012 15:00:18 -0400
Subject: [PATCH] Add support for server passwords

Change-Id: I0e623df8848b214ef715b2e265e97b71b16d666a
---
 README           |  1 +
 gerritbot/bot.py | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README b/README
index e38dfbe..aa4ed3f 100644
--- a/README
+++ b/README
@@ -15,6 +15,7 @@ when starting the bot. It should look like:
   pass=PASSWORD
   server=irc.freenode.net
   port=6667
+  server_password=SERVERPASS
   channel_config=/path/to/yaml/config
   
   [gerrit]
diff --git a/gerritbot/bot.py b/gerritbot/bot.py
index 30e4ec8..52e2f83 100755
--- a/gerritbot/bot.py
+++ b/gerritbot/bot.py
@@ -22,6 +22,7 @@ nick=NICKNAME
 pass=PASSWORD
 server=irc.freenode.net
 port=6667
+server_password=SERVERPASS
 channel_config=/path/to/yaml/config
 
 [gerrit]
@@ -65,9 +66,10 @@ except:
 
 
 class GerritBot(irc.bot.SingleServerIRCBot):
-    def __init__(self, channels, nickname, password, server, port=6667):
+    def __init__(self, channels, nickname, password, server, port=6667,
+                 server_password=None):
         irc.bot.SingleServerIRCBot.__init__(self,
-                                           [(server, port)],
+                                           [(server, port, server_password)],
                                            nickname, nickname)
         self.channel_list = channels
         self.nickname = nickname
@@ -257,7 +259,7 @@ class ChannelConfig(object):
 
 
 def _main():
-    config = ConfigParser.ConfigParser()
+    config = ConfigParser.ConfigParser({'server_password': None})
     config.read(sys.argv[1])
     setup_logging(config)
 
@@ -275,7 +277,8 @@ def _main():
                     config.get('ircbot', 'nick'),
                     config.get('ircbot', 'pass'),
                     config.get('ircbot', 'server'),
-                    config.getint('ircbot', 'port'))
+                    config.getint('ircbot', 'port'),
+                    config.get('ircbot', 'server_password'))
     g = Gerrit(bot,
                channel_config,
                config.get('gerrit', 'host'),