Browse Source

simplify packages insertion

283
ThomasV 10 years ago
parent
commit
56e80566f9
  1. 16
      electrum

16
electrum

@ -26,22 +26,14 @@ import sys
import time import time
import traceback import traceback
is_local = False
is_android = False
if sys.platform == 'darwin':
is_bundle = getattr(sys, 'frozen') == "macosx_app"
if is_bundle:
sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
else:
is_bundle = getattr(sys, 'frozen', False) is_bundle = getattr(sys, 'frozen', False)
is_local = not is_bundle and os.path.dirname(os.path.realpath(__file__)) == os.getcwd() is_local = not is_bundle and os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
is_android = 'ANDROID_DATA' in os.environ is_android = 'ANDROID_DATA' in os.environ
if is_local:
sys.path.append('packages')
is_local = not is_bundle and os.path.dirname(os.path.realpath(__file__)) == os.getcwd() if is_local:
is_android = 'ANDROID_DATA' in os.environ sys.path.insert(0, 'packages')
elif is_bundle and sys.platform=='darwin':
sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
import __builtin__ import __builtin__
__builtin__.use_local_modules = is_local or is_android __builtin__.use_local_modules = is_local or is_android

Loading…
Cancel
Save