summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2018-02-24 17:57:01 -0800
committerMicah Lee <micah@micahflee.com>2018-02-24 17:57:01 -0800
commitc0ba9ab27857f4aa92e90f2694d5fa27d67e4acb (patch)
tree1f98e34c4bc3a8260c8027d96bef7bc2d09a2050
parent9345f62ff0f3c0c15c62428e6e41377a748ba5a0 (diff)
parente76b1e0c2809f82a6aa9b3083ddb042576da16ea (diff)
downloadonionshare-c0ba9ab27857f4aa92e90f2694d5fa27d67e4acb.tar.gz
onionshare-c0ba9ab27857f4aa92e90f2694d5fa27d67e4acb.zip
Merge branch 'delirious-lettuce-remove_platform_re' into develop
-rw-r--r--onionshare/common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/onionshare/common.py b/onionshare/common.py
index 79d62ca9..d90f3b78 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