electrum

commit 4120678dffbf4a02df903c4dc8aa95b1eb01c333
parent dda4a0fcb3671a260cd5bee61ef83b747e179678
Author: ThomasV <thomasv@gitorious>
Date:   Tue, 27 Jan 2015 10:01:40 +0100

add google protobuf to packages

Diffstat:
M
MANIFEST.in
 | 
1
+
M
electrum
 | 
14
++++++++++----
M
lib/paymentrequest.py
 | 
2
+-

3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -7,6 +7,7 @@ recursive-include lib *.py
 recursive-include gui *.py
 recursive-include plugins *.py
 recursive-include packages *.py
+recursive-include packages cacert.pem
 include app.fil
 include icons.qrc
 recursive-include icons *
diff --git a/electrum b/electrum
@@ -32,7 +32,7 @@ is_local = not is_bundle and os.path.dirname(os.path.realpath(__file__)) == os.g
 is_android = 'ANDROID_DATA' in os.environ
 
 if is_local:
-    sys.path.append('packages')
+    sys.path.insert(0,'packages')
 
 import __builtin__
 __builtin__.use_local_modules = is_local or is_android
@@ -49,16 +49,22 @@ try:
     import pyasn1_modules
     import tlslite
     import pbkdf2
+    import google.protobuf
 except ImportError as e:
     sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message)
 
-# these imports must be redeclared for pyinstaller
+# the following imports are for pyinstaller
 import pyasn1.codec
 import pyasn1.codec.der
 from pyasn1.codec.der import encoder, decoder
 from pyasn1_modules import rfc2459
+from google.protobuf import descriptor
+from google.protobuf import message
+from google.protobuf import reflection
+from google.protobuf import descriptor_pb2
 
-# test that we have the correct version of ecdsa
+
+# check that we have the correct version of ecdsa
 try:
     from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1
 except Exception:
@@ -79,7 +85,7 @@ from electrum.util import print_msg, print_stderr, print_json, set_verbosity, In
 from electrum.daemon import get_daemon
 from electrum.plugins import init_plugins
 
-
+#print_msg("ca_bundle", requests.utils.DEFAULT_CA_BUNDLE_PATH, os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH))
 
 # get password routine
 def prompt_password(prompt, confirm=True):
diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
@@ -31,7 +31,7 @@ import requests
 
 try:
     import paymentrequest_pb2
-except:
+except ImportError:
     sys.exit("Error: could not find paymentrequest_pb2.py. Create it with 'protoc --proto_path=lib/ --python_out=lib/ lib/paymentrequest.proto'")
 
 import bitcoin