[gozerbot] 2 new revisions pushed by bthate on 2011-10-10 21:28 GMT

[goze...@googlecode.com]

2 new revisions:

Revision: 17e5f3639de5
Author: Bart Thate <bth...@gmail.com>
Date: Mon Oct 10 14:25:18 2011
Log: FIX: Debian Bug report logs - #640850 ssl deprecation warning
http://code.google.com/p/gozerbot/source/detail?r=17e5f3639de5

Revision: 6b7911c6f44a
Author: Bart Thate <bth...@gmail.com>
Date: Mon Oct 10 14:28:12 2011
Log: log properly
http://code.google.com/p/gozerbot/source/detail?r=6b7911c6f44a

==============================================================================
Revision: 17e5f3639de5
Author: Bart Thate <bth...@gmail.com>
Date: Mon Oct 10 14:25:18 2011
Log: FIX: Debian Bug report logs - #640850 ssl deprecation warning
http://code.google.com/p/gozerbot/source/detail?r=17e5f3639de5

Modified:
/gozerbot/irc/irc.py

=======================================
--- /gozerbot/irc/irc.py Thu Sep 22 13:16:53 2011
+++ /gozerbot/irc/irc.py Mon Oct 10 14:25:18 2011
@@ -205,9 +205,11 @@
# enable ssl if set
if self.cfg.has_key('ssl') and self.cfg['ssl']:
rlog(10, self.name, 'ssl enabled')
- self.sock = socket.ssl(self.oldsock)
- else:
- self.sock = self.oldsock
+ try:
+ import ssl
+ self.sock = ssl.wrap_socket(self.oldsock)
+ except Exception, ex: handle_exception() ; self.sock =
socket.ssl(self.oldsock)
+ else: self.sock = self.oldsock

# try to release the outputlock
try:

==============================================================================
Revision: 6b7911c6f44a
Author: Bart Thate <bth...@gmail.com>
Date: Mon Oct 10 14:28:12 2011
Log: log properly
http://code.google.com/p/gozerbot/source/detail?r=6b7911c6f44a

Modified:
/gozerbot/irc/irc.py

=======================================
--- /gozerbot/irc/irc.py Mon Oct 10 14:25:18 2011
+++ /gozerbot/irc/irc.py Mon Oct 10 14:28:12 2011
@@ -207,8 +207,11 @@
rlog(10, self.name, 'ssl enabled')
try:
import ssl
+ rlog(10, self.name, 'using ssl.wrap_socket()')
self.sock = ssl.wrap_socket(self.oldsock)
- except Exception, ex: handle_exception() ; self.sock =
socket.ssl(self.oldsock)
+ except Exception, ex:
+ rlog(10, self.name, 'using socket.ssl()')
+ self.sock = socket.ssl(self.oldsock)
else: self.sock = self.oldsock

# try to release the outputlock