From 9e6e443f4fe19f506bbfac311ee2df598affcb90 Mon Sep 17 00:00:00 2001
From: Dirkjan Mollema <dirkjan.mollema@fox-it.com>
Date: Wed, 28 Mar 2018 14:26:59 +0200
Subject: [PATCH] Bumped scapy version to 2.4.0, compatible with both py2 and
 py3

---
 requirements.txt | 4 +---
 setup.py         | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 312db5f..3a39081 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,6 @@
-scapy; python_version < '3.0'
+scapy>=2.4
 ipaddress; python_version < '3.0'
 future; python_version < '3.0'
 
-scapy-python3; python_version > '3.0'
-
 twisted
 netifaces
diff --git a/setup.py b/setup.py
index 32efce2..eaf3d0b 100644
--- a/setup.py
+++ b/setup.py
@@ -2,9 +2,9 @@
 import sys
 # Python 2 vs 3 requirements
 if sys.version_info[0] == 2:
-    reqs = ["scapy", "ipaddress", "future", "twisted", "netifaces"]
+    reqs = ["scapy>=2.4", "ipaddress", "future", "twisted", "netifaces"]
 else:
-    reqs = ["scapy-python3", "twisted", "netifaces"]
+    reqs = ["scapy>=2.4", "twisted", "netifaces"]
 
 setup(name='mitm6',
       version='0.2.0',