Fix deprecated warnings

[remyleone]

SUMMARY

• base64.encodestring is deprecated. https://docs.python.org/3/library/base64.html#base64.encodestring

ISSUE TYPE

• Bugfix Pull Request

ANSIBLE VERSION

$ ansible --version
ansible 2.6.0 (fix_deprecated cbdae1b688) last updated 2018/04/06 11:13:21 (GMT +200)
  config file = None
  configured module search path = [u'/Users/sieben/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
  ansible python module location = /Users/sieben/workspace/ansible/lib/ansible
  executable location = /Users/sieben/workspace/ansible/bin/ansible
  python version = 2.7.14 (default, Mar  9 2018, 23:57:12) [GCC 4.2.1 Compatible Apple LLVM 9.0.0 (clang-900.0.39.2)]

[ansibot]

cc @dominis @pcgentry @suprememoocow @thaumos @tsalle
click here for bot help

[mkrizek]

But that will explode on python 2.x since base64.encodebytes is not available there , no?

[remyleone]

Is there a method to have it work on both versions? I don't think there is any support on six for base64 migration between python2/3 :( Le ven. 6 avr. 2018 à 11:27, Martin Krizek <notifications@github.com> a écrit :

…

But that will explode on python 2.x since base64.encodebytes is not available there , no? — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#38388 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AASXIs2FirsASFhD0D-1JRgO-ppM4Qdeks5tlzTkgaJpZM4TJvfq> .

[mkrizek]

cc @abadger @webknjaz

[abadger]

@mkrizek is correct. You probably want to switch to b64encode instead. Also, any deprecaution warning is probably less important than making sure tthat we're only passing bytes into these functions. I'd use ansible.module_utils._text.to_bytes("string", errors="surrogate_or_strict") to make sure we're sending in be strings.

…

On Fri, Apr 6, 2018, 3:15 AM Martin Krizek ***@***.***> wrote: cc @abadger <https://github.com/abadger> @webknjaz <https://github.com/webknjaz> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#38388 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAMxWkWmV8dhye6on3YbfuDQR7xmSFBTks5tl0A4gaJpZM4TJvfq> .

[webknjaz]

It's also possible to shim it like:

try:
    from base64 import encodebytes
except ImportError:
    from base64 import encodestring as encodebytes

somewhere in compat module and use it from there.

[webknjaz]

Alternatively, add moves to ansible.module_utils._text (to mirror this PR):

import six
for pf in 'de', 'en':
    mv = six.MovedAttribute(
        'base64_%scodebytes' % pf,
        'base64', 'base64',
        '%scodestring' % pf,
        '%scodebytes' % pf
    )
    six.add_move(mv)

from six.moves import base64_encodebytes

[abadger]

Both encodebytes and encodestring are part of the legacy/deprecated API. That's why I recommend switching to b64encode.

…

.

[ansibot]

cc @seuf
click here for bot help

[seuf]

LGTM

[remyleone]

@abadger done I've changed it to use ansible.module_utils._text import to_bytes tell me what you think :)

[abadger]

Oops, Sorry to have confused the matter. You'll still need to use base64.b64encode() around the outside of the to_bytes() call.

In Python 3, b64encode only takes byte strings so the call to to_bytes ensures that we are calling b64encode() on a bytes value. We still need to call b64encode on those bytes in order to encode them in the base64 alphabet.

[remyleone]

@abadger done

[remyleone]

@webknjaz are you satisfied with the current solution?

[mkrizek]

@sieben I am curious as to why you didn't use base64.b64encode() as @abadger suggested?

[remyleone]

@mkrizek I misread :) Fixed

[abadger]

Merged to devel and cherry-picked to stable-2.5