cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

A few fixes for python3

Browse source 
* socket interfaces take bytes so convert text strings to bytes when
  using them.
* Use b64encode() instead of str.encode('base64')

(cherry picked from commit 56086f3b9e)
This commit is contained in:
Toshio Kuratomi 2016-10-24 18:43:16 -07:00
parent 6b603b026c
commit a2df07ade3
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/module_utils/urls.py
View file

@ -105,8 +105,6 @@ import platform
import tempfile import tempfile
import base64 import base64
from ansible.module_utils.basic import get_distribution, get_exception
try: try:
import httplib import httplib
except ImportError: except ImportError:
@ -115,7 +113,9 @@ except ImportError:
import ansible.module_utils.six.moves.urllib.request as urllib_request import ansible.module_utils.six.moves.urllib.request as urllib_request
import ansible.module_utils.six.moves.urllib.error as urllib_error import ansible.module_utils.six.moves.urllib.error as urllib_error
from ansible.module_utils.basic import get_distribution, get_exception
from ansible.module_utils.six import b from ansible.module_utils.six import b
from ansible.module_utils._text import to_bytes
try: try:
# python3 # python3
@ -672,10 +672,10 @@ class SSLValidationHandler(urllib_request.BaseHandler):
s.sendall(self.CONNECT_COMMAND % (self.hostname, self.port)) s.sendall(self.CONNECT_COMMAND % (self.hostname, self.port))
if proxy_parts.get('username'): if proxy_parts.get('username'):
credentials = "%s:%s" % (proxy_parts.get('username',''), proxy_parts.get('password','')) credentials = "%s:%s" % (proxy_parts.get('username',''), proxy_parts.get('password',''))
s.sendall('Proxy-Authorization: Basic %s\r\n' % credentials.encode('base64').strip()) s.sendall(b('Proxy-Authorization: Basic %s\r\n') % base64.b64encode(to_bytes(credentials, errors='surrogate_or_strict')).strip())
s.sendall('\r\n') s.sendall(b('\r\n'))
connect_result = "" connect_result = b("")
while connect_result.find("\r\n\r\n") <= 0: while connect_result.find(b("\r\n\r\n")) <= 0:
connect_result += s.recv(4096) connect_result += s.recv(4096)
# 128 kilobytes of headers should be enough for everyone. # 128 kilobytes of headers should be enough for everyone.
if len(connect_result) > 131072: if len(connect_result) > 131072:
@ -883,7 +883,10 @@ def open_url(url, data=None, headers=None, method=None, use_proxy=True,
def basic_auth_header(username, password): def basic_auth_header(username, password):
return "Basic %s" % base64.b64encode("%s:%s" % (username, password)) """Takes a username and password and returns a byte string suitable for
using as value of an Authorization header to do basic auth.
"""
return b("Basic %s") % base64.b64encode(to_bytes("%s:%s" % (username, password), errors='surrogate_or_strict'))
def url_argument_spec(): def url_argument_spec():