summaryrefslogtreecommitdiff
path: root/jsonrpclib
diff options
context:
space:
mode:
authorJosh Marshall <jmarshall@ecology-dev.local>2010-11-03 00:49:48 -0500
committerJosh Marshall <jmarshall@ecology-dev.local>2010-11-03 00:49:48 -0500
commita0cd6268562129127ef26cf22391d0a41ed2f05f (patch)
tree21c8329a0bb0b703c0a29ff8893014a27ade826f /jsonrpclib
parent4a8dbe46c37cdee00c897d566de1f54f6a40eae7 (diff)
downloadjsonrpclib-a0cd6268562129127ef26cf22391d0a41ed2f05f.tar.gz
Initial SSL modifications for client.
Diffstat (limited to 'jsonrpclib')
-rw-r--r--jsonrpclib/jsonrpc.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/jsonrpclib/jsonrpc.py b/jsonrpclib/jsonrpc.py
index 8d4ffc1..8e50079 100644
--- a/jsonrpclib/jsonrpc.py
+++ b/jsonrpclib/jsonrpc.py
@@ -102,9 +102,11 @@ def jloads(json_string):
class ProtocolError(Exception):
pass
-class Transport(XMLTransport):
+class TransportMixIn(object):
""" Just extends the XMLRPC transport where necessary. """
user_agent = config.user_agent
+ # for Python 2.7 support
+ _connection = None
def send_content(self, connection, request_body):
connection.putheader("Content-Type", "application/json-rpc")
@@ -137,12 +139,12 @@ class JSONTarget(object):
def close(self):
return ''.join(self.data)
-class SafeTransport(XMLSafeTransport):
- """ Just extends for HTTPS calls """
- user_agent = Transport.user_agent
- send_content = Transport.send_content
- getparser = Transport.getparser
+class Transport(TransportMixIn, XMLTransport):
+ pass
+class SafeTransport(TransportMixIn, XMLSafeTransport):
+ pass
+
class ServerProxy(XMLServerProxy):
"""
Unfortunately, much more of this class has to be copied since