From ae33775ca6a3e42178c597418695e57e372c0982 Mon Sep 17 00:00:00 2001
From: gpotter2 <gabriel@potter.fr>
Date: Thu, 9 Mar 2017 23:26:06 +0100
Subject: [PATCH] Better names
---
scapy/dadict.py | 4 ++--
scapy/modules/voip.py | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/scapy/dadict.py b/scapy/dadict.py
index 8ab314ae..c799b87c 100644
--- a/scapy/dadict.py
+++ b/scapy/dadict.py
@@ -25,7 +25,7 @@ class DADict_Exception(Scapy_Exception):
class DADict:
def __init__(self, _name="DADict", **kargs):
self._name=_name
- self._update(kargs)
+ self.update(kargs)
def fixname(self,val):
return fixname(val)
def __contains__(self, val):
@@ -56,7 +56,7 @@ class DADict:
return False
return True
- def _update(self, *args, **kwargs):
+ def update(self, *args, **kwargs):
for k, v in dict(*args, **kwargs).iteritems():
self[k] = v
diff --git a/scapy/modules/voip.py b/scapy/modules/voip.py
index 53036a78..de1ce5f2 100644
--- a/scapy/modules/voip.py
+++ b/scapy/modules/voip.py
@@ -24,9 +24,6 @@ sox_base = "sox -t .ul %s - -t ossdsp /dev/dsp"
if WINDOWS:
if conf.prog.sox is None:
raise OSError("Sox must be installed to play VoIP packets")
- finally:
- if p_test:
- p_test.terminate()
sox_base = "\"" + conf.prog.sox + "\" -t .ul %s - -t waveaudio"
def _merge_sound_bytes(x,y,sample_size=2):
--
GitLab