Merge pull request #1000 from duk3luk3/ssl-recv-fix

Make _ssl_recv always return bytes
sopel-irc · Jan 16, 2016 · b5f30c8 · b5f30c8
2 parents 9b250d7 + 52fbfab
commit b5f30c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sopel/irc.py b/sopel/irc.py
@@ -276,7 +276,7 @@ def _ssl_recv(self, buffer_size):
             data = self.socket.read(buffer_size)
             if not data:
                 self.handle_close()
-                return ''
+                return b''
             return data
         except ssl.SSLError as why:
             if why[0] in (asyncore.ECONNRESET, asyncore.ENOTCONN,
@@ -285,7 +285,7 @@ def _ssl_recv(self, buffer_size):
                 return ''
             elif why[0] == errno.ENOENT:
                 # Required in order to keep it non-blocking
-                return ''
+                return b''
             else:
                 raise