diff --git a/lib/ansible/modules/network/junos/junos_config.py b/lib/ansible/modules/network/junos/junos_config.py index a60098ab8fe..d8c0572b799 100644 --- a/lib/ansible/modules/network/junos/junos_config.py +++ b/lib/ansible/modules/network/junos/junos_config.py @@ -175,6 +175,7 @@ backup_path: """ import re import json +import sys from xml.etree import ElementTree @@ -185,6 +186,12 @@ from ansible.module_utils.junos import check_args as junos_check_args from ansible.module_utils.netconf import send_request from ansible.module_utils.six import string_types +if sys.version_info < (2, 7): + from xml.parsers.expat import ExpatError + ParseError = ExpatError +else: + ParseError = ElementTree.ParseError + USE_PERSISTENT_CONNECTION = True DEFAULT_COMMENT = 'configured by junos_config' @@ -207,7 +214,7 @@ def guess_format(config): try: ElementTree.fromstring(config) return 'xml' - except ElementTree.ParseError: + except ParseError: pass if config.startswith('set') or config.startswith('delete'):