diff options
author | Nathaniel Case <this.is@nathanielca.se> | 2018-06-22 11:50:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 11:50:44 -0400 |
commit | 9aa8c652ba12573e09810ee86c700f0b7420e830 (patch) | |
tree | 0052b75edd0e718e6ca0f623f9253e48dbfcb260 /lib/ansible/modules/network/junos/junos_lldp_interface.py | |
parent | c144adc9de47293a1a8a1d723517f08c3cb1d871 (diff) | |
download | ansible-9aa8c652ba12573e09810ee86c700f0b7420e830.tar.gz |
Netconf bytes fixes (#41607)
* Solve some bytes issues on iosxr
* Solve some bytes issues in junos
* Do the correct thing with tostring based on lxml or not
Diffstat (limited to 'lib/ansible/modules/network/junos/junos_lldp_interface.py')
-rw-r--r-- | lib/ansible/modules/network/junos/junos_lldp_interface.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/ansible/modules/network/junos/junos_lldp_interface.py b/lib/ansible/modules/network/junos/junos_lldp_interface.py index af4a7f5948..5e683c74f6 100644 --- a/lib/ansible/modules/network/junos/junos_lldp_interface.py +++ b/lib/ansible/modules/network/junos/junos_lldp_interface.py @@ -97,14 +97,9 @@ import collections from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.network.junos.junos import junos_argument_spec -from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele +from ansible.module_utils.network.junos.junos import load_config, map_params_to_obj, map_obj_to_ele, tostring from ansible.module_utils.network.junos.junos import commit_configuration, discard_changes, locked_config -try: - from lxml.etree import tostring -except ImportError: - from xml.etree.ElementTree import tostring - USE_PERSISTENT_CONNECTION = True |