diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/framework.py | 14 | ||||
| -rw-r--r-- | test/requirements.txt | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/test/framework.py b/test/framework.py index 82d1c35fd7c..970c42de809 100644 --- a/test/framework.py +++ b/test/framework.py @@ -7,6 +7,7 @@ import sys import os import select import signal +import subprocess import unittest import tempfile import time @@ -40,19 +41,6 @@ from scapy.layers.inet import IPerror, TCPerror, UDPerror, ICMPerror from scapy.layers.inet6 import ICMPv6DestUnreach, ICMPv6EchoRequest from scapy.layers.inet6 import ICMPv6EchoReply -if os.name == 'posix' and sys.version_info[0] < 3: - # using subprocess32 is recommended by python official documentation - # @ https://docs.python.org/2/library/subprocess.html - import subprocess32 as subprocess -else: - import subprocess - -# Python2/3 compatible -try: - input = raw_input -except NameError: - pass - logger = logging.getLogger(__name__) # Set up an empty logger for the testcase that can be overridden as necessary diff --git a/test/requirements.txt b/test/requirements.txt index 017c7a92518..a83b5b3101b 100644 --- a/test/requirements.txt +++ b/test/requirements.txt @@ -12,7 +12,6 @@ psutil # BSD pycodestyle # MIT (Expat license) https://pypi.org/project/pycodestyle/ scapy==2.4.3; python_version >= '2.7' or python_version >= '3.4' # GPL2 https://github.com/secdev/scapy/blob/master/LICENSE six # MIT -subprocess32 # PSF syslog_rfc5424_parser>=0.3.1 # ISC objgraph # MIT pympler # Apache-2.0 |