bumping version to 0.29-1

[certmaster.git] / certmaster / SSLConnection.py

diff --git a/certmaster/SSLConnection.py b/certmaster/SSLConnection.py
index c266906..3e72d5e 100644 (file)
--- a/certmaster/SSLConnection.py
+++ b/certmaster/SSLConnection.py
@@ -62,7 +62,7 @@ class SSLConnection:
         c, a = self.__dict__["conn"].accept()
         return (SSLConnection(c), a)
 
-    def makefile(self, mode, bufsize):
+    def makefile(self, mode='r', bufsize=-1):
         """
         We need to use socket._fileobject Because SSL.Connection
         doesn't have a 'dup'. Not exactly sure WHY this is, but
@@ -97,6 +97,9 @@ class SSLConnection:
         if not con in write:
             raise socket.timeout((110, "Operation timed out."))
 
+        if hasattr(data, 'tobytes'):
+            data = data.tobytes()
+
         starttime = time.time()
         origlen = len(data)
         sent = -1