commit 064f0b71e27967f6f956e7869940450a6e5fd5b6
parent f583fcfedbd6e9b7a00caec9f88452f6d61938fd
Author: ThomasV <thomasv@gitorious>
Date: Tue, 18 Aug 2015 12:36:12 +0200
dns is used by android now
Diffstat:
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/contrib/make_android b/contrib/make_android
@@ -21,8 +21,6 @@ if __name__ == '__main__':
shutil.copyfile('scripts/authenticator.py', target + '/authenticator.py')
shutil.copytree("packages",'dist/e4a-%s/packages'%version, ignore=shutil.ignore_patterns('*.pyc'))
shutil.copytree("lib",'dist/e4a-%s/lib'%version, ignore=shutil.ignore_patterns('*.pyc'))
- # dns is not used by android app
- os.system('rm -rf %s/packages/dns'%target)
os.mkdir(target + '/gui')
shutil.copyfile('gui/android.py', target + '/gui/android.py')
open(target + '/gui/__init__.py','w').close()
diff --git a/electrum b/electrum
@@ -37,8 +37,7 @@ elif is_bundle and sys.platform=='darwin':
# pure-python dependencies need to be imported here for pyinstaller
try:
- if not is_android:
- import dns
+ import dns
import aes
import ecdsa
import requests