[Pkg-privacy-commits] [onionshare] 12/53: No need to pass transparent_torification into wait_for_hs

Ulrike Uhlig u-guest at moszumanska.debian.org
Wed Dec 30 00:20:11 UTC 2015


This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch debian
in repository onionshare.

commit 82e0c4e1222e0d30890f9d090f9ae39f265ff325
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Sep 8 17:48:16 2015 -0700

    No need to pass transparent_torification into wait_for_hs
---
 onionshare/hs.py         | 4 ++--
 onionshare/onionshare.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/onionshare/hs.py b/onionshare/hs.py
index 9a0a5b7..5d8dee1 100644
--- a/onionshare/hs.py
+++ b/onionshare/hs.py
@@ -101,7 +101,7 @@ class HS(object):
             onion_host = open(hostname_file, 'r').read().strip()
             return onion_host
 
-    def wait_for_hs(self, onion_host, transparent_torification):
+    def wait_for_hs(self, onion_host):
         # legacy only, this function is no longer required with ephemeral hidden services
         print strings._('wait_for_hs')
 
@@ -111,7 +111,7 @@ class HS(object):
                 sys.stdout.write('{0:s} '.format(strings._('wait_for_hs_trying')))
                 sys.stdout.flush()
 
-                if transparent_torification:
+                if self.transparent_torification:
                     # no need to set the socks5 proxy
                     urllib2.urlopen('http://{0:s}'.format(onion_host))
                 else:
diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index 68340df..91686ad 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -141,7 +141,7 @@ def main(cwd=None):
         # wait for hs, only if using old version of tor
         if not app.hs.supports_ephemeral:
             if not app.local_only:
-                ready = app.hs.wait_for_hs(app.onion_host, app.transparent_torification)
+                ready = app.hs.wait_for_hs(app.onion_host)
                 if not ready:
                     sys.exit()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git



More information about the Pkg-privacy-commits mailing list