[Checkins] SVN: z3c.json/trunk/ Fix my previous SafeBasicAuthTransport refactoring.

[Adam Groszer]

Log message for revision 116018:
  Fix my previous SafeBasicAuthTransport refactoring.
  Tests are still missing for SSL transports.
  

Changed:
  U   z3c.json/trunk/CHANGES.txt
  U   z3c.json/trunk/src/z3c/json/transport.py

-=-
Modified: z3c.json/trunk/CHANGES.txt
===================================================================
--- z3c.json/trunk/CHANGES.txt	2010-08-30 08:17:41 UTC (rev 116017)
+++ z3c.json/trunk/CHANGES.txt	2010-08-30 08:51:15 UTC (rev 116018)
@@ -5,7 +5,8 @@
 0.5.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fix my previous SafeBasicAuthTransport refactoring.
+  Tests are still missing for SSL transports.
 
 
 0.5.3 (2010-08-29)

Modified: z3c.json/trunk/src/z3c/json/transport.py
===================================================================
--- z3c.json/trunk/src/z3c/json/transport.py	2010-08-30 08:17:41 UTC (rev 116017)
+++ z3c.json/trunk/src/z3c/json/transport.py	2010-08-30 08:51:15 UTC (rev 116018)
@@ -65,7 +65,7 @@
         self._target.feed(self.data)
 
 
-class Transport:
+class Transport(object):
     """Handles an HTTP transaction to an JSON-RPC server.
 
     Standard transport class for JSON-RPC over HTTP.
@@ -201,7 +201,7 @@
         return u.close()
 
 
-class SafeTransport(Transport):
+class SafeTransportMixin(object):
     """Handles an HTTPS transaction to an JSON-RPC server."""
 
     def make_connection(self, host):
@@ -220,8 +220,11 @@
         else:
             return HTTPS(host, None, **(x509 or {}))
 
+class SafeTransport(SafeTransportMixin, Transport):
+    """Handles an HTTPS transaction to an JSON-RPC server."""
 
 class BasicAuthTransport(Transport):
+    """Handles a transaction to an JSON-RPC server using HTTP basic auth."""
 
     def __init__(self, username=None, password=None, verbose=0):
         self.username=username
@@ -235,7 +238,7 @@
                 base64.encodestring("%s:%s" % (self.username, self.password)
                     ).replace("\012", ""))
 
-        Transport.send_content(self, connection, request_body)
+        super(BasicAuthTransport, self).send_content(connection, request_body)
 
-class SafeBasicAuthTransport(SafeTransport, BasicAuthTransport):
+class SafeBasicAuthTransport(SafeTransportMixin, BasicAuthTransport):
     """Basic AUTH through HTTPS"""
\ No newline at end of file