From 9ca71249c64f443199dc9ad7d79290e57e17cd21 Mon Sep 17 00:00:00 2001
From: gpotter2 <gpotter@potter.fr>
Date: Mon, 20 Mar 2017 21:01:03 +0100
Subject: [PATCH] Small fixes
---
scapy/arch/windows/__init__.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scapy/arch/windows/__init__.py b/scapy/arch/windows/__init__.py
index e5872b06..8ebbf388 100755
--- a/scapy/arch/windows/__init__.py
+++ b/scapy/arch/windows/__init__.py
@@ -6,7 +6,7 @@
"""
Customizations needed to support Microsoft Windows.
"""
-import os, re, sys, socket, time, itertools, platform, subprocess
+import os, re, sys, socket, time, itertools, platform
import subprocess as sp
from glob import glob
import tempfile
@@ -233,6 +233,7 @@ def win_find_exe(filename, installsubdir=None, env="ProgramFiles"):
break
return path
+
def is_new_release(ignoreVBS=False):
release = platform.release()
if conf.prog.powershell is None and not ignoreVBS:
@@ -285,7 +286,7 @@ if conf.prog.tcpdump != "windump" and conf.use_npcap:
def test_windump_npcap():
"""Return wether windump version is correct or not"""
try:
- p_test_windump = subprocess.Popen([conf.prog.tcpdump, "-help"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ p_test_windump = sp.Popen([conf.prog.tcpdump, "-help"], stdout=sp.PIPE, stderr=sp.STDOUT)
stdout, err = p_test_windump.communicate()
return "npcap" in stdout.lower()
except:
--
GitLab