Browse Source

get rid of pyasn1 dependencies

master
ThomasV 11 years ago
parent
commit
47f89f43b6
  1. 2
      contrib/make_packages
  2. 6
      electrum
  3. 2
      setup.py

2
contrib/make_packages

@ -18,8 +18,6 @@ if __name__ == '__main__':
'ecdsa', 'ecdsa',
'pbkdf2', 'pbkdf2',
'requests', # note: requests-2.5.1 is needed to build with pyinstaller 'requests', # note: requests-2.5.1 is needed to build with pyinstaller
'pyasn1',
'pyasn1_modules',
'qrcode', 'qrcode',
'google/protobuf', 'google/protobuf',
'tlslite', 'tlslite',

6
electrum

@ -47,8 +47,6 @@ try:
import requests import requests
import six import six
import qrcode import qrcode
import pyasn1
import pyasn1_modules
import tlslite import tlslite
import pbkdf2 import pbkdf2
import google.protobuf import google.protobuf
@ -56,10 +54,6 @@ except ImportError as e:
sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message) sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message)
# the following imports are 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 descriptor
from google.protobuf import message from google.protobuf import message
from google.protobuf import reflection from google.protobuf import reflection

2
setup.py

@ -33,8 +33,6 @@ setup(
'ecdsa>=0.9', 'ecdsa>=0.9',
'pbkdf2', 'pbkdf2',
'requests', 'requests',
'pyasn1-modules',
'pyasn1',
'qrcode', 'qrcode',
'protobuf', 'protobuf',
'tlslite', 'tlslite',

Loading…
Cancel
Save