From 305fadca74a15eda9724841017aa492ae5a7871d Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holger@nahrstaedt.de>
Date: Sat, 28 Apr 2018 13:25:39 +0200
Subject: [PATCH] Prepare next release and fix wallet unlock for keyring
Fix wallet unlock when using keyring
---
beem/version.py | 2 +-
beem/wallet.py | 1 +
beemapi/version.py | 2 +-
beembase/version.py | 2 +-
beemgrapheneapi/version.py | 2 +-
beemgraphenebase/version.py | 2 +-
setup.py | 2 +-
7 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/beem/version.py b/beem/version.py
index 16889273..14bc76e8 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.24'
+version = '0.19.25'
diff --git a/beem/wallet.py b/beem/wallet.py
index 4889e2c7..5ad9e3f5 100644
--- a/beem/wallet.py
+++ b/beem/wallet.py
@@ -190,6 +190,7 @@ class Wallet(object):
elif password_storage == "keyring" and KEYRING_AVAILABLE:
log.debug("Trying to use keyring to unlock wallet")
pwd = keyring.get_password("beem", "wallet")
+ self.unlock(pwd)
else:
raise WrongMasterPasswordException
diff --git a/beemapi/version.py b/beemapi/version.py
index 16889273..14bc76e8 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.24'
+version = '0.19.25'
diff --git a/beembase/version.py b/beembase/version.py
index 16889273..14bc76e8 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.24'
+version = '0.19.25'
diff --git a/beemgrapheneapi/version.py b/beemgrapheneapi/version.py
index 16889273..14bc76e8 100644
--- a/beemgrapheneapi/version.py
+++ b/beemgrapheneapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.24'
+version = '0.19.25'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 16889273..14bc76e8 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.24'
+version = '0.19.25'
diff --git a/setup.py b/setup.py
index 4218019c..6944c0c5 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
-VERSION = '0.19.24'
+VERSION = '0.19.25'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
--
GitLab