[Pkg-anonymity-tools] [onionshare] 18/57: pep8: blank after comma and colon

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag 0.7
in repository onionshare.

commit 63965fd2d94c8297bffeb312bbaca7deaf8fb7c6
Author: Thomas Waldmann <tw at waldmann-edv.de>
Date:   Tue Nov 18 18:35:09 2014 +0100

    pep8: blank after comma and colon
---
 onionshare/helpers.py            |  4 ++--
 onionshare/onionshare.py         | 12 ++++++------
 onionshare_gui/file_selection.py |  2 +-
 onionshare_gui/onionshare_gui.py |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/onionshare/helpers.py b/onionshare/helpers.py
index da7e911..210b9d2 100644
--- a/onionshare/helpers.py
+++ b/onionshare/helpers.py
@@ -61,7 +61,7 @@ def constant_time_compare(val1, val2):
 def random_string(num_bytes, output_len=None):
     b = os.urandom(num_bytes)
     h = hashlib.sha256(b).digest()[:16]
-    s = base64.b32encode(h).lower().replace('=','')
+    s = base64.b32encode(h).lower().replace('=', '')
     if not output_len:
         return s
     return s[:output_len]
@@ -71,7 +71,7 @@ def human_readable_filesize(b):
     thresh = 1024.0
     if b < thresh:
         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
     b /= thresh
     while b >= thresh:
diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index 742a6b9..7e95c26 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -38,8 +38,8 @@ def hsdic2list(dic):
     """Convert what we get from get_conf_map to what we need for set_options"""
     return [
         pair for pairs in [
-            [('HiddenServiceDir',vals[0]),('HiddenServicePort',vals[1])]
-            for vals in zip(dic.get('HiddenServiceDir',[]),dic.get('HiddenServicePort',[]))
+            [('HiddenServiceDir', vals[0]), ('HiddenServicePort', vals[1])]
+            for vals in zip(dic.get('HiddenServiceDir', []), dic.get('HiddenServicePort', []))
         ] for pair in pairs
     ]
 
@@ -70,7 +70,7 @@ class OnionShare(object):
             hsdic = self.controller.get_conf_map('HiddenServiceOptions') or {
                 '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)
                 del hsdic['HiddenServiceDir'][dropme]
                 del hsdic['HiddenServicePort'][dropme]
@@ -138,13 +138,13 @@ class OnionShare(object):
                 hsdic = self.controller.get_conf_map('HiddenServiceOptions') or {
                     '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
                     dropme = hsdic['HiddenServiceDir'].index(self.hidserv_dir)
                     del hsdic['HiddenServiceDir'][dropme]
                     del hsdic['HiddenServicePort'][dropme]
-                hsdic['HiddenServiceDir'] = hsdic.get('HiddenServiceDir',[])+[self.hidserv_dir]
-                hsdic['HiddenServicePort'] = hsdic.get('HiddenServicePort',[])+[
+                hsdic['HiddenServiceDir'] = hsdic.get('HiddenServiceDir', [])+[self.hidserv_dir]
+                hsdic['HiddenServicePort'] = hsdic.get('HiddenServicePort', [])+[
                     '80 127.0.0.1:{0}'.format(self.port) ]
 
                 self.controller.set_options(hsdic2list(hsdic))
diff --git a/onionshare_gui/file_selection.py b/onionshare_gui/file_selection.py
index eb6cb36..e890140 100644
--- a/onionshare_gui/file_selection.py
+++ b/onionshare_gui/file_selection.py
@@ -130,7 +130,7 @@ class FileList(QtGui.QListWidget):
         thresh = 1024.0
         if b < thresh:
             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
         b /= thresh
         while b >= thresh:
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index f20c681..f74b4cc 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -153,7 +153,7 @@ class OnionShareGui(QtGui.QWidget):
             self.start_server_finished.emit()
 
         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.start()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git