From 36869f465fea712f09b3a9bf9bbd50dd0550f04e Mon Sep 17 00:00:00 2001
From: Phil <phil@secdev.org>
Date: Mon, 7 Jul 2008 16:14:09 +0200
Subject: [PATCH] Moved warning() into error.py
---
scapy/error.py | 5 +++++
scapy/main.py | 1 +
scapy/plist.py | 1 +
scapy/route.py | 1 +
4 files changed, 8 insertions(+)
diff --git a/scapy/error.py b/scapy/error.py
index c67ba142..9fe5645a 100644
--- a/scapy/error.py
+++ b/scapy/error.py
@@ -45,6 +45,11 @@ log_runtime.addFilter(ScapyFreqFilter())
log_interactive = logging.getLogger("scapy.interactive") # logs in interactive functions
log_loading = logging.getLogger("scapy.loading") # logs when loading scapy
+
+def warning(x):
+ log_runtime.warning(x)
+
+
if __name__ == "__main__":
log_scapy.setLevel(1)
diff --git a/scapy/main.py b/scapy/main.py
index ceba8b06..99febe18 100644
--- a/scapy/main.py
+++ b/scapy/main.py
@@ -1,6 +1,7 @@
from __future__ import generators
import os,sys
+from error import *
DEFAULT_CONFIG_FILE = os.path.join(os.environ["HOME"], ".scapy_startup.py")
diff --git a/scapy/plist.py b/scapy/plist.py
index 6cd7b976..65b4a7ac 100644
--- a/scapy/plist.py
+++ b/scapy/plist.py
@@ -1,5 +1,6 @@
import os,socket
from config import conf
+from error import warning
from base_classes import BasePacket,BasePacketList
#############
diff --git a/scapy/route.py b/scapy/route.py
index d7cd7646..647b5851 100644
--- a/scapy/route.py
+++ b/scapy/route.py
@@ -2,6 +2,7 @@ import socket
from arch import read_routes
from utils import atol
from config import conf
+from error import warning
##############################
## Routing/Interfaces stuff ##
--
GitLab