ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-05 16:04:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix use of bytes in cliconf plugins for Python 3 (#37715)

Browse source 
* Remove raw byte-strings from cliconf plugins of supported platforms + edgeos

Remove uses of to_bytes, too

* Update CliConfBase docstring to reflect current position on byte strings
This commit is contained in:
Nathaniel Case 2018-04-17 10:15:21 -04:00 • committed by GitHub
commit 3b3c72f3e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 41 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/plugins/cliconf/junos.py
View file

@ -23,7 +23,7 @@ import json
import re
from itertools import chain
from ansible.module_utils._text import to_bytes, to_text
from ansible.module_utils._text import to_text
from ansible.module_utils.network.common.utils import to_list
from ansible.plugins.cliconf import CliconfBase
@ -78,15 +78,15 @@ class Cliconf(CliconfBase):
comment: Optional commit description.
"""
comment = kwargs.get('comment', None)
command = b'commit'
command = 'commit'
if comment:
command += b' comment {0}'.format(comment)
command += b' and-quit'
command += ' comment {0}'.format(comment)
command += ' and-quit'
return self.send_command(command)
def discard_changes(self):
command = b'rollback 0'
for cmd in chain(to_list(command), b'exit'):
command = 'rollback 0'
for cmd in chain(to_list(command), 'exit'):
self.send_command(cmd)
def get_capabilities(self):
@ -97,7 +97,7 @@ class Cliconf(CliconfBase):
return json.dumps(result)
def compare_configuration(self, rollback_id=None):
command = b'show | compare'
command = 'show | compare'
if rollback_id is not None:
command += b' rollback %s' % int(rollback_id)
command += ' rollback %s' % int(rollback_id)
return self.send_command(command)