summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2018-02-24 19:40:23 -0800
committerMicah Lee <micah@micahflee.com>2018-02-24 19:40:23 -0800
commit79b461d07110b050e011c7997e3060105cede444 (patch)
treef1d9bf9a152544b6bffbfb13e476a7a724ff18da
parent43930058fbf76e613e7e8ffb62a383a4b9fef393 (diff)
parentc0ba9ab27857f4aa92e90f2694d5fa27d67e4acb (diff)
downloadonionshare-79b461d07110b050e011c7997e3060105cede444.tar.gz
onionshare-79b461d07110b050e011c7997e3060105cede444.zip
Merge branch 'develop' into 641_fix_images_windows
-rw-r--r--onionshare/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/onionshare/common.py b/onionshare/common.py
index 9703e0f5..0d00c7b1 100644
--- a/onionshare/common.py
+++ b/onionshare/common.py
@@ -23,7 +23,6 @@ import inspect
import os
import platform
import random
-import re
import socket
import sys
import tempfile
@@ -58,10 +57,11 @@ def get_platform():
Returns the platform OnionShare is running on.
"""
plat = platform.system()
- if re.match('^.*BSD$', plat):
+ if plat.endswith('BSD'):
plat = 'BSD'
return plat
+
def get_resource_path(filename):
"""
Returns the absolute path of a resource, regardless of whether OnionShare is installed