electrum

commit fbb0801d1582367142bc03cee94419aba46b211c
parent feebd7c25381ca7b0b9538665a3b3d86ae3f3cd3
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 18 Sep 2014 23:38:30 +0200

better workaround for tlslite issue

Diffstat:
M
lib/x509.py
 | 
3
+++
M
setup.py
 | 
3
+--

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/x509.py b/lib/x509.py
@@ -36,6 +36,9 @@ except ImportError:
     sys.exit("Error: tlslite does not seem to be installed. Try 'sudo pip install tlslite'")
 
 
+# workaround https://github.com/trevp/tlslite/issues/15
+tlslite.utils.cryptomath.pycryptoLoaded = False
+
 
 from pyasn1.codec.der import decoder, encoder
 from pyasn1.type.univ import Any, ObjectIdentifier, OctetString
diff --git a/setup.py b/setup.py
@@ -56,8 +56,6 @@ data_files += [
 for lang in os.listdir('data/wordlist'):
     data_files.append((os.path.join(appdata_dir, 'wordlist'), ['data/wordlist/%s' % lang]))
 
-# replace tlslite because of https://github.com/trevp/tlslite/issues/15
-os.system("pip install http://download.electrum.org/tlslite-0.4.5.tar.gz")
 
 setup(
     name="Electrum",
@@ -71,6 +69,7 @@ setup(
         'pyasn1-modules',
         'qrcode',
         'SocksiPy-branch',
+        'tlslite'
     ],
     package_dir={
         'electrum': 'lib',