From 2d20e152894ea7d9c788dc5030f55fc5f172cd55 Mon Sep 17 00:00:00 2001 From: Pierre LALET Date: Sun, 7 Jan 2018 18:04:43 +0100 Subject: [PATCH] Linux: clean-up arch specific module --- scapy/arch/linux.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/scapy/arch/linux.py b/scapy/arch/linux.py index 2d081ce86..5ca52b41a 100644 --- a/scapy/arch/linux.py +++ b/scapy/arch/linux.py @@ -8,10 +8,18 @@ Linux specific functions. """ from __future__ import absolute_import -import sys, os, struct, socket, time -from select import select + + +import array +import ctypes from fcntl import ioctl -import array, ctypes +import os +from select import select +import socket +import struct +import sys +import time + from scapy.compat import * from scapy.consts import LOOPBACK_NAME, IS_64BITS @@ -408,11 +416,10 @@ class L3PacketSocket(SuperSocket): if self.promisc: if iface is None: self.iff = get_if_list() + elif isinstance(iface, list): + self.iff = iface else: - if iface.__class__ is list: - self.iff = iface - else: - self.iff = [iface] + self.iff = [iface] for i in self.iff: set_promisc(self.ins, i) def close(self): @@ -566,11 +573,10 @@ class L2ListenSocket(SuperSocket): self.promisc = promisc if iface is None: self.iff = get_if_list() + elif isinstance(iface, list): + self.iff = iface else: - if iface.__class__ is list: - self.iff = iface - else: - self.iff = [iface] + self.iff = [iface] if self.promisc: for i in self.iff: set_promisc(self.ins, i)