electrum

commit 47f89f43b6403b9c9ee633e0f992e2ab66f5b333
parent ed5258e4063edcfc1085d0f4e4d80e2483ae65e8
Author: ThomasV <thomasv@gitorious>
Date:   Tue, 14 Apr 2015 15:10:44 +0200

get rid of pyasn1 dependencies

Diffstat:
M
contrib/make_packages
 | 
2
--
M
electrum
 | 
6
------
M
setup.py
 | 
2
--

3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/contrib/make_packages b/contrib/make_packages
@@ -18,8 +18,6 @@ if __name__ == '__main__':
         'ecdsa',
         'pbkdf2',
         'requests', # note: requests-2.5.1 is needed to build with pyinstaller
-        'pyasn1',
-        'pyasn1_modules',
         'qrcode',
         'google/protobuf',
         'tlslite',
diff --git a/electrum b/electrum
@@ -47,8 +47,6 @@ try:
     import requests
     import six
     import qrcode
-    import pyasn1
-    import pyasn1_modules
     import tlslite
     import pbkdf2
     import google.protobuf
@@ -56,10 +54,6 @@ except ImportError as e:
     sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message)
 
 # 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
diff --git a/setup.py b/setup.py
@@ -33,8 +33,6 @@ setup(
         'ecdsa>=0.9',
         'pbkdf2',
         'requests',
-        'pyasn1-modules',
-        'pyasn1',
         'qrcode',
         'protobuf',
         'tlslite',