tMerge branch 'SomberNight-setconfig_rpcpassword' - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c9249281f324102997c475b490587233145b8a01
DIR parent c8e67e2bd07efe042703bc1368d499c5e555f854
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sun, 14 Jan 2018 12:27:49 +0100
Merge branch 'SomberNight-setconfig_rpcpassword'
Diffstat:
M electrum | 3 ++-
M gui/qt/__init__.py | 3 ++-
M lib/commands.py | 8 +++-----
3 files changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -278,7 +278,8 @@ def run_offline_command(config, config_options):
# arguments passed to function
args = [config.get(x) for x in cmd.params]
# decode json arguments
- args = list(map(json_decode, args))
+ if cmdname not in ('setconfig',):
+ args = list(map(json_decode, args))
# options
kwargs = {}
for x in cmd.options:
DIR diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
t@@ -92,7 +92,8 @@ class ElectrumGui:
#network.add_jobs([DebugMem([Abstract_Wallet, SPV, Synchronizer,
# ElectrumWindow], interval=5)])
QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_X11InitThreads)
- QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts)
+ if hasattr(QtCore.Qt, "AA_ShareOpenGLContexts"):
+ QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts)
self.config = config
self.daemon = daemon
self.plugins = plugins
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -34,7 +34,7 @@ from functools import wraps
from decimal import Decimal
from .import util
-from .util import bfh, bh2u, format_satoshis
+from .util import bfh, bh2u, format_satoshis, json_decode
from .import bitcoin
from .bitcoin import is_address, hash_160, COIN, TYPE_ADDRESS
from .i18n import _
t@@ -151,10 +151,8 @@ class Commands:
@command('')
def setconfig(self, key, value):
"""Set a configuration variable. 'value' may be a string or a Python expression."""
- try:
- value = ast.literal_eval(value)
- except:
- pass
+ if key not in ('rpcuser', 'rpcpassword'):
+ value = json_decode(value)
self.config.set_key(key, value)
return True