electrum

commit 1023240369f55aee4278457a9931741b425181db
parent bbfd708333421119c78398f050be4f2898adc8c1
Author: ThomasV <thomasv@gitorious>
Date:   Mon, 11 Aug 2014 13:22:53 +0200

workaround the official distribution of tlslite

Diffstat:
M
lib/paymentrequest.py
 | 
4
++++
M
setup.py
 | 
4
+++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
@@ -77,6 +77,7 @@ def load_certificates():
                 x.parse(c)
             except Exception as e:
                 util.print_error("cannot parse cert:", e)
+                continue
             ca_list[x.getFingerprint()] = x
     ca_f.close()
     util.print_error("%d certificates"%len(ca_list))
@@ -325,6 +326,9 @@ class PaymentRequest:
 
 if __name__ == "__main__":
 
+    util.set_verbosity(True)
+    load_certificates()
+
     try:
         uri = sys.argv[1]
     except:
diff --git a/setup.py b/setup.py
@@ -52,11 +52,13 @@ data_files += [
     ])
 ]
 
+# replace tlslite
+os.system("pip install http://download.electrum.org/tlslite-0.4.5.tar.gz")
 
 setup(
     name="Electrum",
     version=version.ELECTRUM_VERSION,
-    install_requires=['slowaes', 'ecdsa>=0.9', 'pbkdf2', 'requests', 'pyasn1', 'pyasn1-modules', 'tlslite>=0.4.5', 'qrcode'],
+    install_requires=['slowaes', 'ecdsa>=0.9', 'pbkdf2', 'requests', 'pyasn1', 'pyasn1-modules', 'qrcode'],
     package_dir={
         'electrum': 'lib',
         'electrum_gui': 'gui',