[tor-commits] [oonib/master] Fix compatibility with txtorcon >= 0.10.0

Thu Aug 28 23:35:31 UTC 2014

commit 4c7ed13fffea854f2f62d0bba61c50fd833bde9b
Author: Arturo FilastÃ² <art at fuffa.org>
Date:   Fri Aug 29 01:22:21 2014 +0200

    Fix compatibility with txtorcon >= 0.10.0
---
 oonib/runner.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/oonib/runner.py b/oonib/runner.py
index aa5cd1a..84b1e88 100644
--- a/oonib/runner.py
+++ b/oonib/runner.py
@@ -63,8 +63,12 @@ else:
             endpointName = endpoint.settings['name']
 
             def setup_complete(port):
+                if LooseVersion(txtorcon_version) >= LooseVersion('0.10.0'):
+                    onion_uri = port.address.onion_uri
+                else:
+                    onion_uri = port.onion_uri
                 print("Exposed %s Tor hidden service "
-                      "on httpo://%s" % (endpointName, port.onion_uri))
+                      "on httpo://%s" % (endpointName, onion_uri))
 
             public_port = 80
             data_dir = os.path.join(torconfig.DataDirectory, endpointName)

