From 5b21824b0fcbb806ebaeaf5924a3216aae50f2c5 Mon Sep 17 00:00:00 2001
From: Holger <holger@nahrstaedt.de>
Date: Fri, 15 Jun 2018 22:46:13 +0200
Subject: [PATCH] Prepare next release and fix unit test for py2.7
---
beem/account.py | 4 ++--
beem/comment.py | 6 +++---
beem/version.py | 2 +-
beem/vote.py | 2 +-
beem/witness.py | 2 +-
beemapi/version.py | 2 +-
beembase/version.py | 2 +-
beemgraphenebase/version.py | 2 +-
setup.py | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/beem/account.py b/beem/account.py
index 81ff3077..c4475660 100644
--- a/beem/account.py
+++ b/beem/account.py
@@ -167,12 +167,12 @@ class Account(BlockchainObject):
"sbd_seconds", "savings_sbd_seconds", "average_bandwidth", "lifetime_bandwidth", "lifetime_market_bandwidth", "reputation",
]
for p in parse_int:
- if p in output and isinstance(output[p], int) and output[p] != 0:
+ if p in output and isinstance(output[p], integer_types) and output[p] != 0:
output[p] = str(output[p])
if "proxied_vsf_votes" in output:
proxied_vsf_votes = []
for p_int in output["proxied_vsf_votes"]:
- if isinstance(p_int, int) and p_int != 0:
+ if isinstance(p_int, integer_types) and p_int != 0:
proxied_vsf_votes.append(str(p_int))
else:
proxied_vsf_votes.append(p_int)
diff --git a/beem/comment.py b/beem/comment.py
index b6fdfbd7..093bace2 100644
--- a/beem/comment.py
+++ b/beem/comment.py
@@ -185,7 +185,7 @@ class Comment(BlockchainObject):
"author_reputation",
]
for p in parse_int:
- if p in output and isinstance(output[p], int):
+ if p in output and isinstance(output[p], integer_types):
output[p] = str(output[p])
if "active_votes" in output:
new_active_votes = []
@@ -200,7 +200,7 @@ class Comment(BlockchainObject):
"rshares", "reputation",
]
for p in parse_int:
- if p in vote and isinstance(vote[p], int):
+ if p in vote and isinstance(vote[p], integer_types):
vote[p] = str(vote[p])
new_active_votes.append(vote)
output["active_votes"] = new_active_votes
@@ -462,7 +462,7 @@ class Comment(BlockchainObject):
else:
if pending_payout_value is None:
pending_payout_value = Amount(self["pending_payout_value"], steem_instance=self.steem)
- elif isinstance(pending_payout_value, (float, int)):
+ elif isinstance(pending_payout_value, (float, integer_types)):
pending_payout_value = Amount(pending_payout_value, "SBD", steem_instance=self.steem)
elif isinstance(pending_payout_value, str):
pending_payout_value = Amount(pending_payout_value, steem_instance=self.steem)
diff --git a/beem/version.py b/beem/version.py
index 6b1a8078..7e7bc393 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.38'
+version = '0.19.39'
diff --git a/beem/vote.py b/beem/vote.py
index ee1d3c3d..ec3dff59 100644
--- a/beem/vote.py
+++ b/beem/vote.py
@@ -148,7 +148,7 @@ class Vote(BlockchainObject):
"rshares", "reputation",
]
for p in parse_int:
- if p in output and isinstance(output[p], int):
+ if p in output and isinstance(output[p], integer_types):
output[p] = str(output[p])
return json.loads(str(json.dumps(output)))
diff --git a/beem/witness.py b/beem/witness.py
index 820afd93..6bf457d9 100644
--- a/beem/witness.py
+++ b/beem/witness.py
@@ -103,7 +103,7 @@ class Witness(BlockchainObject):
"votes", "virtual_last_update", "virtual_position", "virtual_scheduled_time",
]
for p in parse_int:
- if p in output and isinstance(output[p], int):
+ if p in output and isinstance(output[p], integer_types):
output[p] = str(output[p])
return json.loads(str(json.dumps(output)))
diff --git a/beemapi/version.py b/beemapi/version.py
index 6b1a8078..7e7bc393 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.38'
+version = '0.19.39'
diff --git a/beembase/version.py b/beembase/version.py
index 6b1a8078..7e7bc393 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.38'
+version = '0.19.39'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 6b1a8078..7e7bc393 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.38'
+version = '0.19.39'
diff --git a/setup.py b/setup.py
index 4be95ba8..fed3f077 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.38'
+VERSION = '0.19.39'
tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
--
GitLab