Merge pull request #50 from napalm-automation/develop

Release 0.4.1 - master

napalm_nxos/nxos.py

@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+from __future__ import unicode_literals
+
 # import stdlib
 import re
 import ssl
@@ -36,6 +38,7 @@
 # import NAPALM Base
 import napalm_base.helpers
 from napalm_base import NetworkDriver
+from napalm_base.utils import py23_compat
 from napalm_base.exceptions import ConnectionException
 from napalm_base.exceptions import MergeConfigException
 from napalm_base.exceptions import CommandErrorException
@@ -728,7 +731,7 @@ def get_users(self):
 
             password = user.get('password', '')
             if password:
-                users[username]['password'] = password.strip()
+                users[username]['password'] = py23_compat.text_type(password.strip())
 
             level = 0
             role = user.get('role', '')
@@ -746,7 +749,7 @@ def get_users(self):
             if sshkeytype and sshkeyvalue:
                 if sshkeytype not in ['ssh-rsa', 'ssh-dsa']:
                     continue
-                users[username]['sshkeys'].append(sshkeyvalue)
+                users[username]['sshkeys'].append(py23_compat.text_type(sshkeyvalue))
 
         return users
 
@@ -849,9 +852,9 @@ def get_config(self, retrieve='all'):
 
         if retrieve.lower() in ('running', 'all'):
             _cmd = 'show running-config'
-            config['running'] = self.cli([_cmd]).get(_cmd)
+            config['running'] = py23_compat.text_type(self.cli([_cmd]).get(_cmd))
         if retrieve.lower() in ('startup', 'all'):
             _cmd = 'show startup-config'
-            config['startup'] = self.cli([_cmd]).get(_cmd)
+            config['startup'] = py23_compat.text_type(self.cli([_cmd]).get(_cmd))
 
         return config

requirements.txt

@@ -1,4 +1,4 @@
-napalm-base==0.17.0
+napalm-base>=0.18.0
 pycsco
 PyYAML  # this is a requirement for pycsco but seems to be missing
 netaddr

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name="napalm-nxos",
-    version="0.4.0",
+    version="0.4.1",
     packages=find_packages(),
     author="David Barroso",
     author_email="[email protected]",