[tor-commits] [ooni-probe/master] Fix import conflict

[art@xxxxxxxxxxxxxx]

commit a96ceb2cb1dbc9a166e9aa792cda7e8f445cfaf1
Author: aagbsn <aagbsn@xxxxxxxx>
Date:   Tue Apr 30 18:42:28 2013 +0800

    Fix import conflict
---
 nettests/experimental/tls_handshake.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py
index 5b1f656..666e961 100644
--- a/nettests/experimental/tls_handshake.py
+++ b/nettests/experimental/tls_handshake.py
@@ -39,7 +39,8 @@ from twisted.internet       import defer, threads
 from twisted.python         import usage, failure
 
 from ooni       import nettest, config
-from ooni.utils import log, NotRootError
+from ooni.utils import log
+from ooni.errors import InsufficientPrivileges
 
 ## For a way to obtain the current version of Firefox's default ciphersuite
 ## list, see https://trac.torproject.org/projects/tor/attachment/ticket/4744/
@@ -340,7 +341,7 @@ class HandshakeTest(nettest.NetTestCase):
                     ## On some *nix distros, /dev/random is 0600 root:root and
                     ## we get a permissions error when trying to read
                     if connection.message.find("[Errno 13]"):
-                        raise NotRootError(
+                        raise InsufficientPrivileges(
                             "%s" % connection.message.split("[Errno 13]", 1)[1])
                 elif isinstance(connection, socket_error):
                     if connection.message.find("[Errno 101]"):



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits