projects
/
invirt/packages/python-jsonrpclib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a8dbe4
)
Initial SSL modifications for client.
author
Josh Marshall
<jmarshall@ecology-dev.local>
Wed, 3 Nov 2010 05:49:48 +0000
(
00:49
-0500)
committer
Josh Marshall
<jmarshall@ecology-dev.local>
Wed, 3 Nov 2010 05:49:48 +0000
(
00:49
-0500)
jsonrpclib/jsonrpc.py
patch
|
blob
|
history
diff --git
a/jsonrpclib/jsonrpc.py
b/jsonrpclib/jsonrpc.py
index
8d4ffc1
..
8e50079
100644
(file)
--- a/
jsonrpclib/jsonrpc.py
+++ b/
jsonrpclib/jsonrpc.py
@@
-102,9
+102,11
@@
def jloads(json_string):
class ProtocolError(Exception):
pass
class ProtocolError(Exception):
pass
-class Transport(XMLTransport):
+class TransportMixIn(object):
""" Just extends the XMLRPC transport where necessary. """
user_agent = config.user_agent
""" 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")
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)
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
class ServerProxy(XMLServerProxy):
"""
Unfortunately, much more of this class has to be copied since