Mercurial > xib
comparison irclib.py @ 159:da2f2dc61e74
fix in irclib, needed because ServerConnection.socket can be a string since 42d7b622776196149c9a9a05da134a85ee9509c6
Signed-off-by: Charly COSTE <changaco@changaco.net>
author | Charly COSTE <changaco@changaco.net> |
---|---|
date | Tue, 19 Jan 2010 09:21:25 +0100 |
parents | 73b6c8d20da7 |
children | 54c0e77370fd |
comparison
equal
deleted
inserted
replaced
158:73b6c8d20da7 | 159:da2f2dc61e74 |
---|---|
573 """[Internal]""" | 573 """[Internal]""" |
574 | 574 |
575 try: | 575 try: |
576 if self.ssl: | 576 if self.ssl: |
577 new_data = self.ssl.read(2**14) | 577 new_data = self.ssl.read(2**14) |
578 elif self.socket: | 578 elif self.socket and hasattr(self.socket, 'recv'): |
579 new_data = self.socket.recv(2**14) | 579 new_data = self.socket.recv(2**14) |
580 else: | 580 else: |
581 return | 581 return |
582 except socket.error, x: | 582 except socket.error, x: |
583 # The server hung up. | 583 # The server hung up. |