Unicode fix2 (#324)

* Handle both ASCII and Unicode content when writing inventory and config files. Fixes #323.

* Increment version.

Author: stacywsmith

library/juniper_junos_facts.py

@@ -166,8 +166,6 @@
 '''
 
 # Standard library imports
-# Python 2.x and 3.x portable open
-from io import open
 import json
 import os.path
 
@@ -311,8 +309,8 @@ def save_inventory(junos_module, inventory):
         file_path = os.path.normpath(os.path.join(save_dir, file_name))
         junos_module.logger.debug("Saving inventory to: %s.", file_path)
         try:
-            with open(file_path, 'wt', encoding='utf-8') as fact_file:
-                fact_file.write(inventory)
+            with open(file_path, 'wb') as fact_file:
+                fact_file.write(inventory.encode(encoding='utf-8'))
             junos_module.logger.debug("Inventory saved to: %s.", file_path)
         except IOError:
             junos_module.fail_json(msg="Unable to save inventory. Failed to "

module_utils/juniper_junos_common.py

@@ -41,8 +41,6 @@
 # Standard library imports
 from argparse import ArgumentParser
 from distutils.version import LooseVersion
-# Python 2.x and 3.x portable open
-from io import open
 import json
 import logging
 import os
@@ -1806,7 +1804,7 @@ def save_text_output(self, name, format, text):
             - If the destination file is not writable.
         """
         file_path = None
-        mode = 'wt'
+        mode = 'wb'
         if name == 'diff':
             if self.params.get('diffs_file') is not None:
                 file_path = os.path.normpath(self.params.get('diffs_file'))
@@ -1832,8 +1830,8 @@ def save_text_output(self, name, format, text):
                 file_path = os.path.normpath(os.path.join(dest_dir, file_name))
         if file_path is not None:
             try:
-                with open(file_path, mode, encoding='utf-8') as save_file:
-                    save_file.write(text)
+                with open(file_path, mode) as save_file:
+                    save_file.write(text.encode(encoding='utf-8'))
                 self.logger.debug("Output saved to: %s.", file_path)
             except IOError:
                 self.fail_json(msg="Unable to save output. Failed to "

version.py

@@ -1,2 +1,2 @@
-VERSION = "2.0.1.dev0"
-DATE = "2018-Jan-11"
+VERSION = "2.0.1"
+DATE = "2018-Jan-15"