commit 6c3086bd249877a04289e10d5aa9adf202cabdf4
Merge: 638a7ef defe98f
Author: Arturo Filastò <art(a)fuffa.org>
Date: Mon May 26 18:47:24 2014 +0200
Merge branch 'kudrom/flag_disable_geoip'
* kudrom/flag_disable_geoip:
Fix misc pylint related errors
Place the annotations inside of the report headers.
Fixed bug in input handling
Added annotations mechanism and improved the UX of the disable geoip flag
Added flag to disable geoip.
ooni/director.py | 20 ++++++++++++--------
ooni/nettest.py | 14 +++++++-------
ooni/oonicli.py | 24 ++++++++++++++++++++----
ooni/reporter.py | 10 ++--------
4 files changed, 41 insertions(+), 27 deletions(-)