Remove HTTP class and use HTTPConnection instead. Fixes bug for Python 3.x on linux.

2 files changed, 6 insertions, 6 deletions

diff --git a/jsonrpclib/SimpleJSONRPCServer.py b/jsonrpclib/SimpleJSONRPCServer.py
index 290fafa..708c5d2 100644
--- a/jsonrpclib/SimpleJSONRPCServer.py
+++ b/jsonrpclib/SimpleJSONRPCServer.py
@@ -187,7 +187,10 @@ class SimpleJSONRPCRequestHandler(
         self.send_header("Content-type", "application/json-rpc")
         self.send_header("Content-length", str(len(response)))
         self.end_headers()
-        self.wfile.write(response.encode())
+        if isinstance(response, bytes):
+            self.wfile.write(response)
+        else:
+            self.wfile.write(response.encode())
         self.wfile.flush()
         self.connection.shutdown(1)
 
diff --git a/jsonrpclib/jsonrpc.py b/jsonrpclib/jsonrpc.py
index 9508b72..4861e4a 100644
--- a/jsonrpclib/jsonrpc.py
+++ b/jsonrpclib/jsonrpc.py
@@ -181,7 +181,7 @@ class SafeTransport(TransportMixIn, XMLSafeTransport):
         XMLSafeTransport.__init__(self)
 
 try:
-    from httplib import HTTP, HTTPConnection
+    from httplib import HTTPConnection
 except ImportError:
     from http.client import HTTPConnection
 from socket import socket
@@ -201,14 +201,11 @@ if (USE_UNIX_SOCKETS):
             self.sock = socket(AF_UNIX, SOCK_STREAM)
             self.sock.connect(self.host)
 
-    class UnixHTTP(HTTP):
-        _connection_class = UnixHTTPConnection
-
     class UnixTransport(TransportMixIn, XMLTransport):
 
         def make_connection(self, host):
             host, extra_headers, x509 = self.get_host_info(host)
-            return UnixHTTP(host)
+            return UnixHTTPConnection(host)
 
 
 class ServerProxy(XMLServerProxy):