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

Merge branch 'build_slug' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-build_slug

Browse Source
This commit is contained in:
Micah Lee 2017-05-24 14:04:06 -07:00
commit 5c02bbffa3
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
onionshare/common.py
View File

@ -136,11 +136,10 @@ def build_slug():
Returns a random string made from two words from the wordlist, such as "deter-trig". Returns a random string made from two words from the wordlist, such as "deter-trig".
""" """
with open(get_resource_path('wordlist.txt')) as f: with open(get_resource_path('wordlist.txt')) as f:
wordlist = f.read().split('\n') wordlist = f.read().split()
wordlist.remove('')
r = SystemRandom() 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): def human_readable_filesize(b):