- merged the two fixes

Sun, 09 Nov 2014 22:35:46 +0200

author
Teemu Piippo <crimsondusk64@gmail.com>
date
Sun, 09 Nov 2014 22:35:46 +0200
changeset 70
3fd78ed9a19f
parent 69
1b84de3e0d29 (current diff)
parent 68
ecc161d4a6fa (diff)
child 71
5ac56e71d820

- merged the two fixes

cobalt.py file | annotate | diff | comparison | revisions
--- a/cobalt.py	Sun Nov 09 22:33:01 2014 +0200
+++ b/cobalt.py	Sun Nov 09 22:35:46 2014 +0200
@@ -151,7 +151,7 @@
 
 		for channel in client.channels:
 			if channel.get_value ('logchannel', default=False):
-				client.write ("PRIVMSG %s :%s" % (channel['name'], line))
+				client.write ("PRIVMSG %s :%s" % (channel.get_value ('name'), line))
 
 #
 # Exception handling
@@ -447,13 +447,13 @@
 
 				for irc_client in g_clients:
 					for channel in irc_client.cfg['channels']:
-						if 'btprivate' in channel and channel['btprivate'] == True:
-							irc_client.privmsg (channel['name'],
+						if channel.get_value ('btprivate', False):
+							irc_client.privmsg (channel.get_value ('name'),
 								"%s: new commit %s by %s: %s"
 								% (repo_name, commit_node, committer, commit_url))
 
 							for line in commit_message.split ('\n'):
-								irc_client.privmsg (channel['name'], line)
+								irc_client.privmsg (channel.get_value ('name'), line)
 						#fi
 					#done
 				#done
@@ -1002,7 +1002,7 @@
 			if channel.get_value ('btannounce', False):
 				if not isprivate or (channel.get_value ('btprivate', False)):
 					self.write ("PRIVMSG %s :[%s] New issue %s, reported by %s: %s: %s" % \
-						(channel['name'], data['project']['name'], idstring, reporter,
+						(channel.get_value ('name'), data['project']['name'], idstring, reporter,
 						data['summary'], self.get_ticket_url (idstring)))
 				#fi
 			#fi

mercurial