[tor-commits] [ooni-probe/master] * Added check on import so that uninitialized /ooni/lib doesn't cause an

[isis@xxxxxxxxxxxxxx]

commit 9577336bf05eee7e0a8c4bf78177f44fc046d169
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Wed Oct 31 19:06:12 2012 +0000

    * Added check on import so that uninitialized /ooni/lib doesn't cause an
      Exception.
---
 ooni/plugins/bridget.py |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py
index 188009c..fcb60bb 100644
--- a/ooni/plugins/bridget.py
+++ b/ooni/plugins/bridget.py
@@ -26,12 +26,16 @@ from zope.interface       import implements
 
 from ooni.utils           import log, date
 from ooni.utils.config    import ValueChecker
-from ooni.utils.onion     import parse_data_dir
-from ooni.utils.onion     import TxtorconImportError
-from ooni.utils.onion     import PTNoBridgesException, PTNotFoundException
+
 from ooni.plugoo.tests    import ITest, OONITest
 from ooni.plugoo.assets   import Asset, MissingAssetException
+from ooni.utils.onion     import TxtorconImportError
+from ooni.utils.onion     import PTNoBridgesException, PTNotFoundException
 
+try:
+    from ooni.utils.onion     import parse_data_dir
+except:
+    log.msg("Please go to /ooni/lib and do 'make txtorcon' to run this test!")
 
 class RandomPortException(Exception):
     """Raised when using a random port conflicts with configured ports."""



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