Updated mock to built-in unittest.mock

development.txt

@@ -1,10 +1,9 @@
 -r requirements.txt
 
 coverage     # http://nedbatchelder.com/code/coverage/
-mock         # http://www.voidspace.org.uk/python/mock/
 nose2        # https://docs.nose2.io/en/latest/
 pep8	     # https://github.com/jcrocholl/pep8
 pyflakes	 # https://launchpad.net/pyflakes
 coveralls	 # https://coveralls.io/
 ntc_templates # user needs to explicitly install this
-cryptography==3.2
+cryptography==3.2

tests/unit/__init__.py

@@ -2,7 +2,7 @@
 import sys
 
 import nose2
-from mock import patch
+from unittest.mock import patch
 
 __author__ = "Nitin Kumar"
 __credits__ = "Jeremy Schulman"

tests/unit/factory/test_cfgtable.py

@@ -13,7 +13,7 @@
 from ncclient.manager import Manager, make_device_handler
 from ncclient.transport import SSHSession
 from lxml import etree
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from jnpr.junos.factory import loadyaml
 from jnpr.junos.factory.factory_loader import FactoryLoader

tests/unit/factory/test_cmdtable.py

@@ -10,7 +10,7 @@
 
 from ncclient.manager import Manager, make_device_handler
 from ncclient.transport import SSHSession
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 import yamlordereddictloader
 from jnpr.junos.factory.factory_loader import FactoryLoader
 import yaml

tests/unit/factory/test_factory_loader.py

@@ -4,7 +4,7 @@
 import unittest
 import nose2
 from jnpr.junos.factory import FactoryLoader
-from mock import patch
+from unittest.mock import patch
 
 
 class TestFactoryLoader(unittest.TestCase):

tests/unit/factory/test_optable.py

@@ -19,7 +19,7 @@
 
 from lxml import etree
 
-from mock import patch
+from unittest.mock import patch
 
 
 class TestFactoryOpTable(unittest.TestCase):

tests/unit/factory/test_table.py

@@ -8,7 +8,7 @@
 from jnpr.junos import Device
 from jnpr.junos.factory.table import Table
 
-from mock import patch
+from unittest.mock import patch
 from lxml import etree
 from jnpr.junos.op.phyport import PhyPortTable
 

tests/unit/factory/test_to_json.py

@@ -5,7 +5,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import patch
+from unittest.mock import patch
 import os
 import json
 

tests/unit/factory/test_view.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from jnpr.junos import Device
 from jnpr.junos.factory.view import View
 from jnpr.junos.op.phyport import PhyPortStatsTable, PhyPortStatsView

tests/unit/facts/test_current_re.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_domain.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_ethernet_mac_table.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_file_list.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 
 from jnpr.junos import Device

tests/unit/facts/test_get_chassis_cluster_status.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_get_chassis_inventory.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 
 from jnpr.junos import Device

tests/unit/facts/test_get_route_engine_information.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_get_software_information.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_get_virtual_chassis_information.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 import sys
 from lxml import etree

tests/unit/facts/test_ifd_style.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from lxml import etree
 

tests/unit/facts/test_iri_mapping.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 
 from jnpr.junos import Device

tests/unit/facts/test_personality.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 from jnpr.junos.exception import RpcError
 

tests/unit/ofacts/test_chassis.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 from lxml import etree
 import os
 

tests/unit/ofacts/test_domain.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 from lxml import etree
 
 from jnpr.junos.ofacts.domain import facts_domain

tests/unit/ofacts/test_ifd_style.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from mock import patch
+from unittest.mock import patch
 import nose2
 
 from jnpr.junos import Device

tests/unit/ofacts/test_personality.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from mock import patch
+from unittest.mock import patch
 import nose2
 
 from jnpr.junos import Device

tests/unit/ofacts/test_routing_engines.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 import sys
 

tests/unit/ofacts/test_srx_cluster.py

@@ -3,7 +3,7 @@
 
 import unittest
 import nose2
-from mock import patch
+from unittest.mock import patch
 import os
 
 from jnpr.junos import Device

tests/unit/ofacts/test_switch_style.py

@@ -2,7 +2,7 @@
 __credits__ = "Jeremy Schulman"
 
 import unittest
-from mock import patch
+from unittest.mock import patch
 import nose2
 
 from jnpr.junos import Device

tests/unit/ofacts/test_swver.py

@@ -6,7 +6,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 import os
 
 from jnpr.junos import Device

tests/unit/test_console.py

@@ -4,7 +4,7 @@
     import unittest
 from jnpr.junos.utils.config import Config
 import nose2
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
 import re
 import sys
 import os

tests/unit/test_decorators.py

@@ -12,7 +12,7 @@
 from jnpr.junos.decorators import timeoutDecorator, normalizeDecorator
 from jnpr.junos.decorators import ignoreWarnDecorator
 
-from mock import patch, MagicMock, PropertyMock, call
+from unittest.mock import patch, MagicMock, PropertyMock, call
 
 from ncclient.operations.rpc import RPCError
 from ncclient.manager import Manager, make_device_handler

tests/unit/test_device.py

@@ -3,7 +3,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import MagicMock, patch, mock_open, call
+from unittest.mock import MagicMock, patch, mock_open, call
 import os
 from lxml import etree
 import sys

tests/unit/test_factcache.py

@@ -3,7 +3,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
 from jnpr.junos.exception import FactLoopError
 
 from jnpr.junos import Device

tests/unit/test_junos.py

@@ -4,7 +4,7 @@
 import sys
 
 import nose2
-from mock import patch
+from unittest.mock import patch
 
 __author__ = "Nitin Kumar"
 __credits__ = "Jeremy Schulman"

tests/unit/test_jxml.py

@@ -2,7 +2,7 @@
 import unittest
 from io import StringIO
 import nose2
-from mock import patch
+from unittest.mock import patch
 from jnpr.junos.jxml import (
     NAME,
     INSERT,

tests/unit/test_rpcmeta.py

@@ -10,7 +10,7 @@
 from ncclient.transport import SSHSession
 from jnpr.junos.exception import JSONLoadError
 
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
 from lxml import etree
 
 __author__ = "Nitin Kumar, Rick Sherman"

tests/unit/transport/test_serial.py

@@ -3,7 +3,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 import sys
 import six
 

tests/unit/transport/test_tty.py

@@ -6,7 +6,7 @@
     import unittest
 
 import nose2
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from jnpr.junos.transport.tty import Terminal
 from jnpr.junos import exception as EzErrors

tests/unit/transport/test_tty_netconf.py

@@ -3,7 +3,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 from jnpr.junos.transport.tty_netconf import tty_netconf
 

tests/unit/transport/test_tty_ssh.py

@@ -6,7 +6,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from jnpr.junos.transport.tty_ssh import SSH
 
 

tests/unit/transport/test_tty_telnet.py

@@ -5,7 +5,7 @@
 except ImportError:
     import unittest
 import nose2
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from jnpr.junos.transport.tty_telnet import Telnet
 import six
 

tests/unit/utils/test_config.py

@@ -19,7 +19,7 @@
 from ncclient.transport import SSHSession
 from ncclient.operations import RPCError, RPCReply
 
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from lxml import etree
 import os
 

tests/unit/utils/test_fs.py

@@ -9,7 +9,7 @@
 from jnpr.junos.utils.fs import FS
 from jnpr.junos.exception import RpcError
 
-from mock import patch, MagicMock, call
+from unittest.mock import patch, MagicMock, call
 from lxml import etree
 
 __author__ = "Nitin Kumar, Rick Sherman"

tests/unit/utils/test_ftp.py

@@ -7,7 +7,7 @@
 from jnpr.junos import Device
 import jnpr.junos.utils.ftp
 
-from mock import patch
+from unittest.mock import patch
 
 if sys.version < "3":
     builtin_string = "__builtin__"