tremove appdata_dir and data_dir - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit e389745491054dfce18e3233b36a3713ea8bd546
DIR parent 4794ccfaf2a9bb555843e52d1c52ff4eeb292acc
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 18 Feb 2015 18:48:32 +0100
remove appdata_dir and data_dir
Diffstat:
M lib/blockchain.py | 2 +-
M lib/network.py | 2 +-
M lib/util.py | 33 -------------------------------
M lib/verifier.py | 2 +-
M plugins/coinbase_buyback.py | 1 -
5 files changed, 3 insertions(+), 37 deletions(-)
---
DIR diff --git a/lib/blockchain.py b/lib/blockchain.py
t@@ -18,7 +18,7 @@
import threading, time, Queue, os, sys, shutil
-from util import user_dir, appdata_dir, print_error
+from util import user_dir, print_error
from bitcoin import *
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -7,7 +7,7 @@ import random
import traceback
-from util import user_dir, appdata_dir, print_error, print_msg
+from util import user_dir, print_error, print_msg
from bitcoin import *
import interface
from blockchain import Blockchain
DIR diff --git a/lib/util.py b/lib/util.py
t@@ -61,39 +61,6 @@ def user_dir():
return
-def data_dir():
- import __builtin__
- if __builtin__.use_local_modules:
- return local_data_dir()
- else:
- is_frozen = getattr(sys, 'frozen', False)
- if is_frozen:
- if is_frozen == "macosx_app":
- basedir = os.path.abspath(".")
- else:
- basedir = sys._MEIPASS
-
- return os.path.join(basedir, 'data')
- else:
- return appdata_dir()
-
-def usr_share_dir():
- return os.path.join(sys.prefix, "share")
-
-def appdata_dir():
- """Find the path to the application data directory; add an electrum folder and return path."""
- if platform.system() == "Windows":
- return os.path.join(os.environ["APPDATA"], "Electrum")
- elif platform.system() == "Linux":
- return os.path.join(usr_share_dir(), "electrum")
- elif (platform.system() == "Darwin" or
- platform.system() == "DragonFly" or
- platform.system() == "OpenBSD" or
- platform.system() == "FreeBSD" or
- platform.system() == "NetBSD"):
- return "/Library/Application Support/Electrum"
- else:
- raise Exception("Unknown system")
def get_resource_path(*args):
DIR diff --git a/lib/verifier.py b/lib/verifier.py
t@@ -18,7 +18,7 @@
import threading, time, Queue, os, sys, shutil
-from util import user_dir, appdata_dir, print_error
+from util import user_dir, print_error
from bitcoin import *
DIR diff --git a/plugins/coinbase_buyback.py b/plugins/coinbase_buyback.py
t@@ -25,7 +25,6 @@ except ImportError as e:
from electrum.plugins import BasePlugin, hook
from electrum.i18n import _, set_language
from electrum.util import user_dir
-from electrum.util import appdata_dir
from electrum.util import format_satoshis
from electrum_gui.qt import ElectrumGui