[Pkg-anonymity-tools] [onionshare] 24/57: Merge pull request #163 from ThomasWaldmann/master

[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 d0bdb9143fba924c28e21aa78449cb2965406b17
Merge: 0812e37 b7a0293
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Nov 24 21:10:37 2014 -0800

    Merge pull request #163 from ThomasWaldmann/master
    
    pep8 fixes

 check_lacked_trans.py            |  6 +--
 onionshare/helpers.py            | 13 ++++--
 onionshare/onionshare.py         | 49 ++++++++++++---------
 onionshare/socks.py              | 92 ++++++++++++++++++++++++++--------------
 onionshare/strings.py            |  2 +
 onionshare/web.py                | 37 ++++++++++++----
 onionshare_gui/common.py         |  2 +
 onionshare_gui/downloads.py      |  1 +
 onionshare_gui/file_selection.py | 10 +++--
 onionshare_gui/onionshare_gui.py |  8 +++-
 onionshare_gui/options.py        |  1 +
 onionshare_gui/server_status.py  |  1 +
 setup.py                         | 17 +++++++-
 setup/onionshare-launcher.py     |  4 +-
 test/onionshare_helpers_test.py  | 10 +++--
 test/onionshare_strings_test.py  | 10 +++--
 test/onionshare_test.py          |  6 ++-
 test/onionshare_web_test.py      |  8 ++--
 test/test_helpers.py             | 20 ++++-----
 19 files changed, 197 insertions(+), 100 deletions(-)

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