Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

No need to pass transparent_torification into wait_for_hs

Browse Source
This commit is contained in:
Micah Lee 2015-09-08 17:48:16 -07:00
parent 1a4cb26f5d
commit 82e0c4e122
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
onionshare/hs.py
View File

@ -101,7 +101,7 @@ class HS(object):
onion_host = open(hostname_file, 'r').read().strip() onion_host = open(hostname_file, 'r').read().strip()
return onion_host 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 # legacy only, this function is no longer required with ephemeral hidden services
print strings._('wait_for_hs') 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.write('{0:s} '.format(strings._('wait_for_hs_trying')))
sys.stdout.flush() sys.stdout.flush()
if transparent_torification: if self.transparent_torification:
# no need to set the socks5 proxy # no need to set the socks5 proxy
urllib2.urlopen('http://{0:s}'.format(onion_host)) urllib2.urlopen('http://{0:s}'.format(onion_host))
else: else:

2
onionshare/onionshare.py
View File

@ -141,7 +141,7 @@ def main(cwd=None):
# wait for hs, only if using old version of tor # wait for hs, only if using old version of tor
if not app.hs.supports_ephemeral: if not app.hs.supports_ephemeral:
if not app.local_only: 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: if not ready:
sys.exit() sys.exit()