Remove 'mock' dependency (#4480)

Author: gpotter2

scapy/utils.py

@@ -981,14 +981,10 @@ class ContextManagerCaptureOutput(object):
     def __init__(self):
         # type: () -> None
         self.result_export_object = ""
-        try:
-            import mock  # noqa: F401
-        except Exception:
-            raise ImportError("The mock module needs to be installed !")
 
     def __enter__(self):
         # type: () -> ContextManagerCaptureOutput
-        import mock
+        from unittest import mock
 
         def write(s, decorator=self):
             # type: (str, ContextManagerCaptureOutput) -> None

test/answering_machines.uts

@@ -8,7 +8,7 @@
 + Answering Machines
 
 = Generic answering machine mocker
-import mock
+from unittest import mock
 @mock.patch("scapy.ansmachine.sniff")
 def test_am(cls_name, packet_query, check_reply, mock_sniff, **kargs):
     packet_query = packet_query.__class__(bytes(packet_query))
@@ -236,7 +236,7 @@ assert res[DHCP6_Solicit]
 a.print_reply(req, res)
 
 = WiFi_am
-import mock
+from unittest import mock
 @mock.patch("scapy.layers.dot11.sniff")
 def test_WiFi_am(packet_query, check_reply, mock_sniff, **kargs):
     def sniff(*args,**kargs):

test/bpf.uts

@@ -114,7 +114,7 @@ s.close()
 = L2bpfListenSocket - read failure
 ~ needs_root
 
-import mock
+from unittest import mock
 
 @mock.patch("scapy.arch.bpf.supersocket.os.read")
 def _test_osread(osread):

test/contrib/dtp.uts

@@ -16,7 +16,7 @@ assert pkt[DTP].tlvlist[3].status == b'\x03'
 
 = Test negotiate_trunk
 
-import mock
+from unittest import mock
 
 def test_pkt(pkt):
     pkt = Ether(raw(pkt))

test/linux.uts

@@ -66,7 +66,7 @@ else:
 = catch loopback device missing
 ~ linux needs_root
 
-from mock import patch
+from unittest.mock import patch
 
 # can't remove the lo device (or its address without causing trouble) - use some pseudo dummy instead
 
@@ -77,7 +77,7 @@ with patch('scapy.arch.linux.conf.loopback_name', 'scapy_lo_x'):
 ~ linux needs_root
 
 import os, socket
-from mock import patch
+from unittest.mock import patch
 
 try:
     exit_status = os.system("ip link add name scapy_lo type dummy")
@@ -116,7 +116,7 @@ finally:
 
 conf.ifaces._add_fake_iface("scapy0", 'e2:39:91:79:19:10')
 
-from mock import patch
+from unittest.mock import patch
 conf.route6.routes =  [('fe80::', 64, '::', 'scapy0', ['fe80::e039:91ff:fe79:1910'], 256)]
 conf.route6.ipv6_ifaces = set(['scapy0'])
 bck_conf_iface = conf.iface
@@ -274,7 +274,7 @@ except Exception:
 = Routing table, interface with no names
 ~ linux
 
-from mock import patch
+from unittest.mock import patch
 
 @patch("scapy.arch.linux.ioctl")
 def test_read_routes(mock_ioctl):
@@ -293,7 +293,8 @@ test_read_routes()
 
 from scapy.arch.linux import L3PacketSocket
 
-import mock, socket
+import socket
+from unittest import mock
 
 @mock.patch("scapy.arch.linux.socket.socket.sendto")
 def test_L3PacketSocket_sendto_python3(mock_sendto):

test/pipetool.uts

@@ -228,7 +228,7 @@ p.wait_and_stop()
 
 = Test SniffSource
 
-import mock
+from unittest import mock
 fd = ObjectPipe("sniffsource")
 fd.write("test")
 
@@ -295,7 +295,7 @@ else:
 
 = Test exhausted AutoSource and SniffSource
 
-import mock
+from unittest import mock
 from scapy.error import Scapy_Exception
 
 def _fail():
@@ -323,7 +323,7 @@ except:
 q = ObjectPipe("wiresharksink")
 pkt = Ether(dst="aa:aa:aa:aa:aa:aa", src="bb:bb:bb:bb:bb:bb")/IP(dst="127.0.0.1", src="127.0.0.1")/ICMP()
 
-import mock
+from unittest import mock
 with mock.patch("scapy.scapypipes.subprocess.Popen", return_value=Bunch(stdin=q)) as popen:
     sink = WiresharkSink()
     sink.start()
@@ -345,7 +345,7 @@ linktype = scapy.data.DLT_EN3MB
 q = ObjectPipe("wiresharksink_linktype")
 pkt = Ether(dst="aa:aa:aa:aa:aa:aa", src="bb:bb:bb:bb:bb:bb")/IP(dst="127.0.0.1", src="127.0.0.1")/ICMP()
 
-import mock
+from unittest import mock
 with mock.patch("scapy.scapypipes.subprocess.Popen", return_value=Bunch(stdin=q)) as popen:
     sink = WiresharkSink(linktype=linktype)
     sink.start()
@@ -363,7 +363,7 @@ linktype = scapy.data.DLT_EN3MB
 q = ObjectPipe("wiresharksink_args")
 pkt = Ether(dst="aa:aa:aa:aa:aa:aa", src="bb:bb:bb:bb:bb:bb")/IP(dst="127.0.0.1", src="127.0.0.1")/ICMP()
 
-import mock
+from unittest import mock
 with mock.patch("scapy.scapypipes.subprocess.Popen", return_value=Bunch(stdin=q)) as popen:
     sink = WiresharkSink(args=['-c', '1'])
     sink.start()
@@ -404,7 +404,7 @@ os.unlink(os.path.join(dname, "t2.pcap.gz"))
 = Test InjectSink and Inject3Sink
 ~ needs_root
 
-import mock
+from unittest import mock
 
 a = IP(dst="192.168.0.1")/ICMP()
 msgs = []