more updates to napalm base imports

ekrichbaum · Jan 21, 2018 · 598a413 · 598a413
1 parent 2beb76f
commit 598a413
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/napalm_panos/panos.py b/napalm_panos/panos.py
@@ -26,16 +26,21 @@
 import time
 
 # local modules
-from napalm_base.utils.string_parsers import convert_uptime_string_seconds
-from napalm_base.exceptions import ConnectionException, ReplaceConfigException,\
-                                   MergeConfigException
-
 try:
+    from napalm.base.utils.string_parsers import convert_uptime_string_seconds
+    from napalm.base.exceptions import ConnectionException,\
+                                       ReplaceConfigException,\
+                                       MergeConfigException
     from napalm.base import NetworkDriver
+    from napalm.base.utils import py23_compat
 except ImportError:
+    from napalm_base.utils.string_parsers import convert_uptime_string_seconds
+    from napalm_base.exceptions import ConnectionException,\
+                                       ReplaceConfigException,\
+                                       MergeConfigException
     from napalm_base.base import NetworkDriver
+    from napalm_base.utils import py23_compat
 
-from napalm_base.utils import py23_compat
 
 from netmiko import ConnectHandler
 from netmiko import __version__ as netmiko_version

diff --git a/test/unit/TestDriver.py b/test/unit/TestDriver.py
@@ -16,7 +16,7 @@
 import unittest
 
 from napalm_panos import panos
-from napalm_base.test.base import TestConfigNetworkDriver
+from napalm.base.test.base import TestConfigNetworkDriver
 
 
 class TestConfigDriver(unittest.TestCase, TestConfigNetworkDriver):

diff --git a/test/unit/conftest.py b/test/unit/conftest.py
@@ -2,8 +2,8 @@
 from builtins import super
 
 import pytest
-from napalm_base.test import conftest as parent_conftest
-from napalm_base.test.double import BaseTestDouble
+from napalm.base.test import conftest as parent_conftest
+from napalm.base.test.double import BaseTestDouble
 
 from napalm_panos import PANOSDriver as OriginalDriver
 

diff --git a/test/unit/test_getters.py b/test/unit/test_getters.py
@@ -1,6 +1,6 @@
 """Tests for getters."""
 
-from napalm_base.test.getters import BaseTestGetters
+from napalm.base.test.getters import BaseTestGetters
 
 
 import pytest