commit 206bae4c2ac450c0eb7de591bf7ee39e944109ef Author: Arturo Filastò <arturo@filasto.net> Date: Tue Jul 24 13:05:24 2012 +0200 Add installation guide. Fix bug in test. --- INSTALL | 14 ++++++++++++++ ooni/plugins/httphost.py | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..863c62b --- /dev/null +++ b/INSTALL @@ -0,0 +1,14 @@ +# Dependencies +* Twisted: http://twistedmatrix.com/trac/ +* PyYAML: http://pyyaml.org/ +* Scapy: http://www.secdev.org/projects/scapy/ + +Optional: +* BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ + +# Installation + +On debian you can install all the dependecies with apt-get with this command: + + apt-get install python-twisted python-twisted-names python-yaml python-scapy python-beautifulsoup + diff --git a/ooni/plugins/httphost.py b/ooni/plugins/httphost.py index ccadff9..b57a50d 100644 --- a/ooni/plugins/httphost.py +++ b/ooni/plugins/httphost.py @@ -10,8 +10,10 @@ from datetime import datetime import urllib2 import httplib - -from BeautifulSoup import BeautifulSoup +try: + from BeautifulSoup import BeautifulSoup +except: + print "Beautiful Soup not installed. HTTPHost may not work" # XXX reduce boilerplating. from zope.interface import implements