Skip to content

Commit dc595c3

Browse files
committed
remove some Py2.6 related code
1 parent 5ad1f34 commit dc595c3

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

scapy/error.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,8 @@ def filter(self, record):
4545
self.warning_table[caller] = (tm,nb)
4646
return 1
4747

48-
try:
49-
from logging import NullHandler
50-
except ImportError:
51-
# compat for python 2.6
52-
from logging import Handler
53-
class NullHandler(Handler):
54-
def emit(self, record):
55-
pass
5648
log_scapy = logging.getLogger("scapy")
57-
log_scapy.addHandler(NullHandler())
49+
log_scapy.addHandler(logging.NullHandler())
5850
log_runtime = logging.getLogger("scapy.runtime") # logs at runtime
5951
log_runtime.addFilter(ScapyFreqFilter())
6052
log_interactive = logging.getLogger("scapy.interactive") # logs in interactive functions

0 commit comments

Comments
 (0)