Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-30 00:03:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

pep8: 2 spaces before inline comments

Browse Source
This commit is contained in:
Thomas Waldmann 2014-11-18 18:37:17 +01:00
parent 63965fd2d9
commit aa2b59ec5d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
onionshare/onionshare.py
View File

@ -102,7 +102,7 @@ class OnionShare(object):
else: else:
args = ['/usr/bin/sudo', '--', '/usr/bin/onionshare'] args = ['/usr/bin/sudo', '--', '/usr/bin/onionshare']
p = subprocess.Popen(args+[str(self.port)], stderr=subprocess.PIPE, stdout=subprocess.PIPE) p = subprocess.Popen(args+[str(self.port)], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
stdout = p.stdout.read(22) # .onion URLs are 22 chars long stdout = p.stdout.read(22) # .onion URLs are 22 chars long
if stdout: if stdout:
self.onion_host = stdout self.onion_host = stdout
@ -187,10 +187,10 @@ class OnionShare(object):
ready = True ready = True
sys.stdout.write('{0}\n'.format(strings._('wait_for_hs_yup'))) sys.stdout.write('{0}\n'.format(strings._('wait_for_hs_yup')))
except socks.SOCKS5Error: # non-Tails error except socks.SOCKS5Error: # non-Tails error
sys.stdout.write('{0}\n'.format(strings._('wait_for_hs_nope'))) sys.stdout.write('{0}\n'.format(strings._('wait_for_hs_nope')))
sys.stdout.flush() sys.stdout.flush()
except urllib2.HTTPError: # Tails error except urllib2.HTTPError: # Tails error
sys.stdout.write('{0}\n'.format(strings._('wait_for_hs_nope'))) sys.stdout.write('{0}\n'.format(strings._('wait_for_hs_nope')))
sys.stdout.flush() sys.stdout.flush()
except KeyboardInterrupt: except KeyboardInterrupt:
@ -282,7 +282,7 @@ def main():
app.cleanup_filenames.append(web.zip_filename) app.cleanup_filenames.append(web.zip_filename)
# warn about sending large files over Tor # warn about sending large files over Tor
if web.zip_filesize >= 157286400: # 150mb if web.zip_filesize >= 157286400: # 150mb
print '' print ''
print strings._("large_filesize") print strings._("large_filesize")
print '' print ''
@ -292,7 +292,7 @@ def main():
t.daemon = True t.daemon = True
t.start() t.start()
try: # Trap Ctrl-C try: # Trap Ctrl-C
# wait for hs # wait for hs
ready = app.wait_for_hs() ready = app.wait_for_hs()
if not ready: if not ready:

2
onionshare_gui/onionshare_gui.py
View File

@ -112,7 +112,7 @@ class OnionShareGui(QtGui.QWidget):
self.status_bar.showMessage(strings._('gui_starting_server3', True)) self.status_bar.showMessage(strings._('gui_starting_server3', True))
# warn about sending large files over Tor # warn about sending large files over Tor
if web.zip_filesize >= 157286400: # 150mb if web.zip_filesize >= 157286400: # 150mb
self.filesize_warning.setText(strings._("large_filesize", True)) self.filesize_warning.setText(strings._("large_filesize", True))
self.filesize_warning.show() self.filesize_warning.show()