From 5037283b6213e8fd12945714476c1b9529e07d76 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 25 Jan 2018 14:35:19 -0500 Subject: [PATCH] Removed support for NAPALM 1.x --- netbox/dcim/api/views.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 23cafe6af..26af44336 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -263,12 +263,7 @@ class DeviceViewSet(CustomFieldModelViewSet): import napalm except ImportError: raise ServiceUnavailable("NAPALM is not installed. Please see the documentation for instructions.") - - # TODO: Remove support for NAPALM < 2.0 - try: - from napalm.base.exceptions import ConnectAuthError, ModuleImportError - except ImportError: - from napalm_base.exceptions import ConnectAuthError, ModuleImportError + from napalm.base.exceptions import ConnectAuthError, ModuleImportError # Validate the configured driver try: