py3
This commit is contained in:
@@ -1,12 +1,18 @@
|
||||
from __future__ import absolute_import
|
||||
from __future__ import division
|
||||
from __future__ import print_function
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import six
|
||||
import ast
|
||||
import json
|
||||
import threading
|
||||
import os
|
||||
|
||||
from copy import deepcopy
|
||||
from util import user_dir, print_error, print_msg, print_stderr, PrintError
|
||||
from .util import user_dir, print_error, print_msg, print_stderr, PrintError
|
||||
|
||||
from bitcoin import MAX_FEE_RATE, FEE_TARGETS
|
||||
from .bitcoin import MAX_FEE_RATE, FEE_TARGETS
|
||||
|
||||
SYSTEM_CONFIG_PATH = "/etc/electrum.conf"
|
||||
|
||||
@@ -96,7 +102,7 @@ class SimpleConfig(PrintError):
|
||||
|
||||
def fixup_config_keys(self, config, keypairs):
|
||||
updated = False
|
||||
for old_key, new_key in keypairs.iteritems():
|
||||
for old_key, new_key in keypairs.items():
|
||||
if old_key in config:
|
||||
if not new_key in config:
|
||||
config[new_key] = config[old_key]
|
||||
@@ -252,17 +258,18 @@ def read_system_config(path=SYSTEM_CONFIG_PATH):
|
||||
result = {}
|
||||
if os.path.exists(path):
|
||||
try:
|
||||
import ConfigParser
|
||||
from six.moves import configparser
|
||||
# import ConfigParser
|
||||
except ImportError:
|
||||
print "cannot parse electrum.conf. please install ConfigParser"
|
||||
print("cannot parse electrum.conf. please install ConfigParser")
|
||||
return
|
||||
|
||||
p = ConfigParser.ConfigParser()
|
||||
p = configparser.ConfigParser()
|
||||
try:
|
||||
p.read(path)
|
||||
for k, v in p.items('client'):
|
||||
result[k] = v
|
||||
except (ConfigParser.NoSectionError, ConfigParser.MissingSectionHeaderError):
|
||||
except (configparser.NoSectionError, configparser.MissingSectionHeaderError):
|
||||
pass
|
||||
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user