Merge pull request #136 from ktbyers/py3_support

PY3 support

.travis.yml

@@ -2,12 +2,14 @@ language: python
 
 python:
     - 2.7
+    - 3.5
+    - 3.6
 
 env:
-    - ANSIBLE_VERSION=2.2
     - ANSIBLE_VERSION=2.3
     - ANSIBLE_VERSION=2.4
     - ANSIBLE_VERSION=2.5
+    - ANSIBLE_VERSION=2.6
 
 install:
     - pip install pylama

CHANGELOG.rst

@@ -1,6 +1,7 @@
 develop
 =====
 
+    - Add Python3 support
     - Add support for saving `candidate_file` during the config install
     - Fix issue with an exception in napalm_install_config
 

napalm_ansible/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function
 import os
 import ansible
 from distutils.version import LooseVersion

napalm_ansible/modules/napalm_cli.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule, return_values
 
 

napalm_ansible/modules/napalm_diff_yang.py

@@ -1,6 +1,5 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-
 """
 (c) 2017 David Barroso <[email protected]>
 
@@ -19,6 +18,7 @@
 You should have received a copy of the GNU General Public License
 along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 """
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule
 
 try:

napalm_ansible/modules/napalm_get_facts.py

@@ -16,6 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 """
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule, return_values
 
 

napalm_ansible/modules/napalm_install_config.py

@@ -17,6 +17,7 @@
 You should have received a copy of the GNU General Public License
 along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 """
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule, return_values
 
 
@@ -175,11 +176,8 @@
 
 
 def save_to_file(content, filename):
-    f = open(filename, 'w')
-    try:
+    with open(filename, 'w') as f:
         f.write(content)
-    finally:
-        f.close()
 
 
 def main():
@@ -288,7 +286,7 @@ def main():
 
     try:
         if get_diffs:
-            diff = device.compare_config().encode('utf-8')
+            diff = device.compare_config()
             changed = len(diff) > 0
         else:
             changed = True

napalm_ansible/modules/napalm_parse_yang.py

@@ -16,7 +16,7 @@
 You should have received a copy of the GNU General Public License
 along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 """
-# standard ansible module imports
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule, return_values
 import json
 

napalm_ansible/modules/napalm_ping.py

@@ -1,5 +1,3 @@
-from ansible.module_utils.basic import AnsibleModule, return_values
-
 """
 (c) 2017 Jason Edelman <[email protected]>
 
@@ -15,6 +13,9 @@
 You should have received a copy of the GNU General Public License
 along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 """
+from __future__ import unicode_literals, print_function
+from ansible.module_utils.basic import AnsibleModule, return_values
+
 
 DOCUMENTATION = '''
 ---

napalm_ansible/modules/napalm_translate_yang.py

@@ -1,6 +1,5 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-
 """
 (c) 2017 David Barroso <[email protected]>
 
@@ -19,7 +18,7 @@
 You should have received a copy of the GNU General Public License
 along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 """
-# standard ansible module imports
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule
 
 try:

napalm_ansible/modules/napalm_validate.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, print_function
 from ansible.module_utils.basic import AnsibleModule, return_values
 
 napalm_found = False

napalm_ansible/plugins/action/napalm.py

@@ -1,4 +1,4 @@
-from __future__ import (absolute_import, division, print_function)
+from __future__ import absolute_import, division, print_function, unicode_literals
 __metaclass__ = type
 
 from ansible.plugins.action.normal import ActionModule as _ActionModule

tests/napalm_get_facts/get_facts_error.yaml

@@ -29,4 +29,5 @@
                 var: ansible_failed_result.msg
         - assert:
             that:
-                - "{{ ansible_failed_result.msg == \"[interfaces] cannot retrieve device data: u'Key blah is not present'\" }}"
+                - "{{ '[interfaces] cannot retrieve device data' in ansible_failed_result.msg }}"
+                - "{{ 'Key blah is not present' in ansible_failed_result.msg }}"