[tor-commits] [ooni-probe/master] Fix import errors in captive portal and url list tests

[art at torproject.org]

commit 86f591da89eae501d43c7d05488d9cd71bf7ab2b
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Nov 12 10:47:27 2012 +0100

    Fix import errors in captive portal and url list tests
    (cherry picked from commit 3c4f147b7fc3b626344b4168ca35c06d5c15bdd1)
---
 nettests/core/captiveportal.py |    3 ++-
 nettests/core/url_list.py      |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/nettests/core/captiveportal.py b/nettests/core/captiveportal.py
index 6641985..66779bb 100644
--- a/nettests/core/captiveportal.py
+++ b/nettests/core/captiveportal.py
@@ -39,6 +39,7 @@ from urlparse import urlparse
 
 from ooni import nettest
 from ooni.templates import httpt
+from ooni.utils import net
 from ooni.utils import log
 
 try:
@@ -53,7 +54,7 @@ __desc__ = "Captive portal detection test"
 
 optParameters = [['asset', 'a', None, 'Asset file'],
                  ['experiment-url', 'e', 'http://google.com/', 'Experiment URL'],
-                 ['user-agent', 'u', random.choice(httpt.useragents),
+                 ['user-agent', 'u', random.choice(net.userAgents),
                   'User agent for HTTP requests']
                 ]
 
diff --git a/nettests/core/url_list.py b/nettests/core/url_list.py
index b6f2d43..06a5147 100644
--- a/nettests/core/url_list.py
+++ b/nettests/core/url_list.py
@@ -3,6 +3,7 @@
 # :authors: Arturo Filastò
 # :licence: see LICENSE
 
+from twisted.python import usage
 from ooni.templates import httpt
 
 class UsageOptions(usage.Options):