From 4d3fec908b8638670cc1739c73415b8fad187f66 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 7 Nov 2016 09:53:26 -0800 Subject: [PATCH] Remove need for translate/maketrans due to py3 differences * translate() has a different api for text vs byte strings * maketrans must be imported from a different location on py2 vs py3 Since this is such a small string outside of a loop we don't have to worry too much about speed so it's better to have a single piece of code that works on both py2 and py3 --- lib/ansible/modules/extras/cloud/vmware/vmware_guest.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_guest.py b/lib/ansible/modules/extras/cloud/vmware/vmware_guest.py index a57409f950d..e3eed12689b 100644 --- a/lib/ansible/modules/extras/cloud/vmware/vmware_guest.py +++ b/lib/ansible/modules/extras/cloud/vmware/vmware_guest.py @@ -278,7 +278,6 @@ except ImportError: pass import os -import string import time from netaddr import IPNetwork, IPAddress @@ -757,11 +756,7 @@ class PyVmomiHelper(object): if [x for x in pspec.keys() if x.startswith('size_') or x == 'size']: # size_tb, size_gb, size_mb, size_kb, size_b ...? if 'size' in pspec: - # http://stackoverflow.com/a/1451407 - trans = string.maketrans('', '') - chars = trans.translate(trans, string.digits) - expected = pspec['size'].translate(trans, chars) - expected = expected + expected = ''.join(c for c in pspec['size'] if c.isdigit()) unit = pspec['size'].replace(expected, '').lower() expected = int(expected) else: