Merge branch 'develop2'

Author: ktbyers

Diff for: .gitignore

@@ -55,6 +55,8 @@ docs/_static/
 
 .idea
 .DS_Store
+.vagrant
+.venv
 
 env
 *.swp

Diff for: .travis.yml

@@ -6,9 +6,14 @@ python:
   - 3.5
   - 3.6
 
+matrix:
+  include:
+      - python: 3.6
+        env: TOXENV=sphinx
+
 install:
-  - pip install tox-travis
-  - pip install coveralls
+  - pip install tox==3.0.0 tox-travis coveralls
+
 deploy:
   provider: pypi
   user: dbarroso

Diff for: Makefile

@@ -0,0 +1,4 @@
+.PHONY: doctest
+doctest:
+	cd docs && make clean
+	cd docs && sphinx-build -W -b html -d _build/doctrees . _build/html

Diff for: README.md

@@ -83,18 +83,18 @@ If you have any issues using NAPALM or encounter any errors, before submitting a
 - Double check you are able to access the device using the credentials provided.
 - Does your device meet the minimum [requirements](http://napalm.readthedocs.io/en/latest/support/index.html#general-support-matrix)?
 - Some operating systems have some specific [constraints](http://napalm.readthedocs.io/en/latest/support/index.html#caveats). (e.g. have you enabled the XML agent on IOS-XR, or the NXAPI feature on NXOS?)
-- Are you able to connect to the device using NAPALM? Check using the CLI test tool:
+- Are you able to connect to the device using NAPALM? Check using napalm CLI to get_facts:
 
 ```bash
-$ cl_napalm_test --vendor VENDOR --user USERNAME --password PASSWORD --optional_args OPTIONAL_ARGS HOSTNAME
+$ napalm --vendor VENDOR --user USERNAME --password PASSWORD --optional_args OPTIONAL_ARGS HOSTNAME call get_facts
 ```
 
 Where vendor, username, password and hostname are mandatory. [Optional arguments](http://napalm.readthedocs.io/en/latest/support/index.html#optional-arguments) are specified as comma separated values.
 
 Example:
 
 ```bash
-$ cl_napalm_test --vendor junos --user napalm --password dbejmujz --optional_args 'port=12202, config_lock=False' edge01.bjm01
+$ napalm --vendor junos --user napalm --password dbejmujz --optional_args 'port=12202, config_lock=False' edge01.bjm01 call get_facts
 ```
 
 In case you have any errors, please review the steps above - this looks like a problem with your environment setup.

Diff for: docs/support/ios.rst

@@ -113,7 +113,7 @@ In vim insert, you can also type <ctrl>+V, release only the V, then type C
 
 
 File Operation Prompts
-_____
+______________________
 
 By default IOS will prompt for confirmation on file operations. These prompts need to be disabled before the NAPALM-ios driver performs any such operation on the device.
 This can be controlled using the `auto_file_prompt` optional arguement:
@@ -126,7 +126,7 @@ This can be controlled using the `auto_file_prompt` optional arguement:
   otherwise a `CommandErrorException` will be raised when file operations are attempted.
 
 SCP File Transfers
-_____
+__________________
 
 The NAPALM-ios driver requires SCP to be enabled on the managed device. SCP
 server functionality is disabled in IOS by default, and is configured using

Diff for: docs/tutorials/lab.rst

@@ -33,7 +33,7 @@ Create a file named ``Vagrantfile`` (no file extension) in your working director
 .. literalinclude:: Vagrantfile
    :language: ruby
 
-The above content is also available on `GitHub <https://raw.githubusercontent.com/napalm-automation/napalm/master/docs/tutorials/Vagrantfile>`_.
+The above content is also available `on GitHub <https://raw.githubusercontent.com/napalm-automation/napalm/master/docs/tutorials/Vagrantfile>`_.
 
 This Vagrantfile creates a base box and a vEOS box when you call ``vagrant up``::
 

Diff for: napalm/base/__init__.py

@@ -88,11 +88,7 @@ def get_network_driver(name, prepend=True):
             module = importlib.import_module(module_name)
             break
         except ImportError as e:
-            try:
-                # gotta love py23 differences
-                message = e.message
-            except AttributeError:
-                message = e.msg
+            message = py23_compat.text_type(e)
             if "No module named" in message:
                 # py2 doesn't have ModuleNotFoundError exception
                 failed_module = message.split()[-1]