diff options
| author | Micah Lee <micah@micahflee.com> | 2017-05-24 14:04:49 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2017-05-24 14:04:49 -0700 |
| commit | d25c6d949f7a2a1d59ea07b87835b091db447cf1 (patch) | |
| tree | 80784f8de547865b9b5ca883487cdffcc11d1e42 | |
| parent | 63b45d348e6521779fddddf79108ae5154da5aeb (diff) | |
| parent | 5c02bbffa37d2e178e2da7bb32a0ee1ba2820670 (diff) | |
| download | onionshare-d25c6d949f7a2a1d59ea07b87835b091db447cf1.tar.gz onionshare-d25c6d949f7a2a1d59ea07b87835b091db447cf1.zip | |
Merge branch 'delirious-lettuce-build_slug'
| -rw-r--r-- | onionshare/common.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/onionshare/common.py b/onionshare/common.py index cff2224b..508acd36 100644 --- a/onionshare/common.py +++ b/onionshare/common.py @@ -136,11 +136,10 @@ def build_slug(): Returns a random string made from two words from the wordlist, such as "deter-trig". """ with open(get_resource_path('wordlist.txt')) as f: - wordlist = f.read().split('\n') - wordlist.remove('') + wordlist = f.read().split() r = SystemRandom() - return '-'.join(r.choice(wordlist) for x in range(2)) + return '-'.join(r.choice(wordlist) for _ in range(2)) def human_readable_filesize(b): |