telectrum: check_imports - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 6a833d9f98b619717da2f0e32d60a203b56361ce
DIR parent 541257be34af2c8f55cd99eaf9f25e48dc0d41ca
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 28 Jan 2016 14:38:10 +0100
electrum: check_imports
Diffstat:
M electrum | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -31,7 +31,8 @@ if is_local or is_android:
elif is_bundle and sys.platform=='darwin':
sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
-if not is_android:
+
+def check_imports():
# pure-python dependencies need to be imported here for pyinstaller
try:
import dns
t@@ -44,20 +45,22 @@ if not is_android:
import google.protobuf
except ImportError as e:
sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message)
-
# the following imports are for pyinstaller
from google.protobuf import descriptor
from google.protobuf import message
from google.protobuf import reflection
from google.protobuf import descriptor_pb2
-
-
# check that we have the correct version of ecdsa
try:
from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1
except Exception:
sys.exit("cannot import ecdsa.curve_secp256k1. You probably need to upgrade ecdsa.\nTry: sudo pip install --upgrade ecdsa")
+ # make sure that certificates are here
+ assert os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH)
+
+if not is_android:
+ check_imports()
# load local module as electrum
if is_bundle or is_local or is_android:
t@@ -251,9 +254,6 @@ def run_offline_command(config, config_options):
if __name__ == '__main__':
- # make sure that certificates are here
- assert os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH)
-
# on osx, delete Process Serial Number arg generated for apps launched in Finder
sys.argv = filter(lambda x: not x.startswith('-psn'), sys.argv)