tfix requests_dir bug - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 10740470cc6e45e8a85d63ac730aec89c742d430
DIR parent d75d3fdf5b4ab134dca7d168aae0ecb697df26df
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 12 Jun 2015 20:18:06 +0200
fix requests_dir bug
Diffstat:
M lib/wallet.py | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1241,16 +1241,17 @@ class Abstract_Wallet(object):
out['status'] = self.get_request_status(addr)
# check if bip70 file exists
rdir = config.get('requests_dir')
- key = out.get('id', addr)
- path = os.path.join(rdir, key + '.bip70')
- if rdir and os.path.exists(path):
- baseurl = 'file://' + rdir
- rewrite = config.get('url_rewrite')
- if rewrite:
- baseurl = baseurl.replace(*rewrite)
- out['request_url'] = os.path.join(baseurl, key + '.bip70')
- out['URI'] += '&r=' + out['request_url']
- out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key
+ if rdir:
+ key = out.get('id', addr)
+ path = os.path.join(rdir, key + '.bip70')
+ if os.path.exists(path):
+ baseurl = 'file://' + rdir
+ rewrite = config.get('url_rewrite')
+ if rewrite:
+ baseurl = baseurl.replace(*rewrite)
+ out['request_url'] = os.path.join(baseurl, key + '.bip70')
+ out['URI'] += '&r=' + out['request_url']
+ out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key
return out
def get_request_status(self, key):