commit 5c9bb4de0724d4ff2eaae6d8ad87f50a922097b4 Merge: 30fa387 fb4bfce Author: Arturo Filastò arturo@filasto.net Date: Thu Nov 6 17:49:51 2014 +0100

Merge pull request #364 from kudrom/fix/utils

refactoring of net and txscapy utils

ooni/errors.py | 16 +++++ ooni/geoip.py | 3 +- ooni/nettest.py | 2 +- .../experimental/bridge_reachability/echo.py | 62 ++++++++--------- ooni/oonicli.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/tests/test_oonicli.py | 2 +- ooni/tests/test_txscapy.py | 13 ---- ooni/tests/test_utils.py | 6 +- ooni/utils/net.py | 34 +++++++++ ooni/utils/txscapy.py | 73 ++------------------ 11 files changed, 96 insertions(+), 119 deletions(-)