IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipalib.rpc: Update for Python 3

Browse Source 
The client XML-RPC implementation is tied to rpclib internals,
so with a change in Python it needs to be updated. And rpclib
changed in Python 3.

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin 2015-09-17 18:48:30 +02:00 committed by Tomas Babej
parent ea2edc9ea2
commit c38516eab7
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ipalib/rpc.py
View File

@ -38,6 +38,7 @@ import locale
import base64
import json
import socket
import gzip
import gssapi
from dns import resolver, rdatatype
@ -602,19 +603,24 @@ class KerbTransport(SSLTransport):
return True
def single_request(self, host, handler, request_body, verbose=0):
# Based on xmlrpc.lient.Transport.single_request
# Based on Python 2.7's xmllib.Transport.single_request
try:
h = SSLTransport.make_connection(self, host)
if verbose:
h.set_debuglevel(1)
while True:
self.send_request(h, handler, request_body)
self.send_host(h, host)
self.send_user_agent(h)
self.send_content(h, request_body)
if six.PY2:
self.send_request(h, handler, request_body)
self.send_host(h, host)
self.send_user_agent(h)
self.send_content(h, request_body)
response = h.getresponse(buffering=True)
else:
self.__send_request(h, host, handler, request_body, verbose)
response = h.getresponse()
response = h.getresponse(buffering=True)
if response.status != 200:
if (response.getheader("content-length", 0)):
response.read()
@ -637,6 +643,23 @@ class KerbTransport(SSLTransport):
finally:
self.close()
if six.PY3:
def __send_request(self, connection, host, handler, request_body, debug):
# Based on xmlrpc.client.Transport.send_request
headers = self._extra_headers[:]
if debug:
connection.set_debuglevel(1)
if self.accept_gzip_encoding and gzip:
connection.putrequest("POST", handler, skip_accept_encoding=True)
connection.putheader("Accept-Encoding", "gzip")
headers.append(("Accept-Encoding", "gzip"))
else:
connection.putrequest("POST", handler)
headers.append(("User-Agent", self.user_agent))
self.send_headers(connection, headers)
self.send_content(connection, request_body)
return connection
def store_session_cookie(self, cookie_header):
'''
Given the contents of a Set-Cookie header scan the header and