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

Cleanup netcli (#17529)

Browse source 
This honestly mostly amounts to Python 3 fixes.
This commit is contained in:
Nathaniel Case 2016-09-12 16:08:21 -04:00 committed by GitHub
parent bf29961947
commit bfe341177b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/netcli.py
View file

@ -28,11 +28,11 @@
import re import re
import time import time
import itertools
import shlex import shlex
from ansible.module_utils.basic import BOOLEANS_TRUE, BOOLEANS_FALSE from ansible.module_utils.basic import BOOLEANS_TRUE, BOOLEANS_FALSE
from ansible.module_utils.six import string_types from ansible.module_utils.six import string_types, text_type
from ansible.module_utils.six.moves import zip
def to_list(val): def to_list(val):
if isinstance(val, (list, tuple)): if isinstance(val, (list, tuple)):
@ -83,7 +83,7 @@ class Cli(object):
def run_commands(self): def run_commands(self):
responses = self.connection.run_commands(self._commands) responses = self.connection.run_commands(self._commands)
for resp, cmd in itertools.izip(responses, self._commands): for resp, cmd in zip(responses, self._commands):
cmd.response = resp cmd.response = resp
# wipe out the commands list to avoid issues if additional # wipe out the commands list to avoid issues if additional
@ -189,7 +189,7 @@ class Conditional(object):
key, op, val = shlex.split(conditional) key, op, val = shlex.split(conditional)
self.key = key self.key = key
self.func = self.func(op) self.func = self._func(op)
self.value = self._cast_value(val) self.value = self._cast_value(val)
def __call__(self, data): def __call__(self, data):
@ -206,9 +206,9 @@ class Conditional(object):
elif re.match(r'^\d+$', value): elif re.match(r'^\d+$', value):
return int(value) return int(value)
else: else:
return unicode(value) return text_type(value)
def func(self, oper): def _func(self, oper):
for func, operators in self.OPERATORS.items(): for func, operators in self.OPERATORS.items():
if oper in operators: if oper in operators:
return getattr(self, func) return getattr(self, func)