commit 102feb1dfd1fecc6dcfd2a81562fc77b4c47c454
parent baa178509a7cb4211c2f9d4ddecf5e2e35282e2b
Author: ThomasV <electrumdev@gmail.com>
Date: Thu, 30 Apr 2015 06:57:14 +0200
Merge pull request #1175 from kyuupichan/dead_import
Remove apparenlty dead import and __builtin__ assignment.
Diffstat:
1 file changed, 0 insertions(+), 3 deletions(-)
diff --git a/electrum b/electrum
@@ -37,9 +37,6 @@ if is_local or is_android:
elif is_bundle and sys.platform=='darwin':
sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
-import __builtin__
-__builtin__.use_local_modules = is_local or is_android
-
# pure-python dependencies need to be imported here for pyinstaller
try:
import aes