Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-26 07:20:33 -04:00
Code Issues Projects Releases Packages Wiki Activity

pep8: blank after comma and colon

Browse source
This commit is contained in:
Thomas Waldmann 2014-11-18 18:35:09 +01:00
parent 179eefae29
commit 63965fd2d9
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
onionshare/helpers.py
View file

@ -61,7 +61,7 @@ def constant_time_compare(val1, val2):
def random_string(num_bytes, output_len=None): def random_string(num_bytes, output_len=None):
b = os.urandom(num_bytes) b = os.urandom(num_bytes)
h = hashlib.sha256(b).digest()[:16] h = hashlib.sha256(b).digest()[:16]
s = base64.b32encode(h).lower().replace('=','') s = base64.b32encode(h).lower().replace('=', '')
if not output_len: if not output_len:
return s return s
return s[:output_len] return s[:output_len]
@ -71,7 +71,7 @@ def human_readable_filesize(b):
thresh = 1024.0 thresh = 1024.0
if b < thresh: if b < thresh:
return '{0} B'.format(b) return '{0} B'.format(b)
units = ['KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB'] units = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']
u = 0 u = 0
b /= thresh b /= thresh
while b >= thresh: while b >= thresh:

12
onionshare/onionshare.py
View file

@ -38,8 +38,8 @@ def hsdic2list(dic):
"""Convert what we get from get_conf_map to what we need for set_options""" """Convert what we get from get_conf_map to what we need for set_options"""
return [ return [
pair for pairs in [ pair for pairs in [
[('HiddenServiceDir',vals[0]),('HiddenServicePort',vals[1])] [('HiddenServiceDir', vals[0]), ('HiddenServicePort', vals[1])]
for vals in zip(dic.get('HiddenServiceDir',[]),dic.get('HiddenServicePort',[])) for vals in zip(dic.get('HiddenServiceDir', []), dic.get('HiddenServicePort', []))
] for pair in pairs ] for pair in pairs
] ]
@ -70,7 +70,7 @@ class OnionShare(object):
hsdic = self.controller.get_conf_map('HiddenServiceOptions') or { hsdic = self.controller.get_conf_map('HiddenServiceOptions') or {
'HiddenServiceDir': [], 'HiddenServicePort': [] 'HiddenServiceDir': [], 'HiddenServicePort': []
} }
if self.hidserv_dir and self.hidserv_dir in hsdic.get('HiddenServiceDir',[]): if self.hidserv_dir and self.hidserv_dir in hsdic.get('HiddenServiceDir', []):
dropme = hsdic['HiddenServiceDir'].index(self.hidserv_dir) dropme = hsdic['HiddenServiceDir'].index(self.hidserv_dir)
del hsdic['HiddenServiceDir'][dropme] del hsdic['HiddenServiceDir'][dropme]
del hsdic['HiddenServicePort'][dropme] del hsdic['HiddenServicePort'][dropme]
@ -138,13 +138,13 @@ class OnionShare(object):
hsdic = self.controller.get_conf_map('HiddenServiceOptions') or { hsdic = self.controller.get_conf_map('HiddenServiceOptions') or {
'HiddenServiceDir': [], 'HiddenServicePort': [] 'HiddenServiceDir': [], 'HiddenServicePort': []
} }
if self.hidserv_dir in hsdic.get('HiddenServiceDir',[]): if self.hidserv_dir in hsdic.get('HiddenServiceDir', []):
# Maybe a stale service with the wrong local port # Maybe a stale service with the wrong local port
dropme = hsdic['HiddenServiceDir'].index(self.hidserv_dir) dropme = hsdic['HiddenServiceDir'].index(self.hidserv_dir)
del hsdic['HiddenServiceDir'][dropme] del hsdic['HiddenServiceDir'][dropme]
del hsdic['HiddenServicePort'][dropme] del hsdic['HiddenServicePort'][dropme]
hsdic['HiddenServiceDir'] = hsdic.get('HiddenServiceDir',[])+[self.hidserv_dir] hsdic['HiddenServiceDir'] = hsdic.get('HiddenServiceDir', [])+[self.hidserv_dir]
hsdic['HiddenServicePort'] = hsdic.get('HiddenServicePort',[])+[ hsdic['HiddenServicePort'] = hsdic.get('HiddenServicePort', [])+[
'80 127.0.0.1:{0}'.format(self.port) ] '80 127.0.0.1:{0}'.format(self.port) ]
self.controller.set_options(hsdic2list(hsdic)) self.controller.set_options(hsdic2list(hsdic))

2
onionshare_gui/file_selection.py
View file

@ -130,7 +130,7 @@ class FileList(QtGui.QListWidget):
thresh = 1024.0 thresh = 1024.0
if b < thresh: if b < thresh:
return '{0} B'.format(b) return '{0} B'.format(b)
units = ['KiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB'] units = ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB']
u = 0 u = 0
b /= thresh b /= thresh
while b >= thresh: while b >= thresh:

2
onionshare_gui/onionshare_gui.py
View file

@ -153,7 +153,7 @@ class OnionShareGui(QtGui.QWidget):
self.start_server_finished.emit() self.start_server_finished.emit()
self.status_bar.showMessage(strings._('gui_starting_server2', True)) self.status_bar.showMessage(strings._('gui_starting_server2', True))
t = threading.Thread(target=finish_starting_server, kwargs={'self':self}) t = threading.Thread(target=finish_starting_server, kwargs={'self': self})
t.daemon = True t.daemon = True
t.start() t.start()