Skip to content
Snippets Groups Projects
Commit 5b21824b authored by Holger's avatar Holger
Browse files

Prepare next release and fix unit test for py2.7

parent 7cde7c4f
No related branches found
No related tags found
No related merge requests found
...@@ -167,12 +167,12 @@ class Account(BlockchainObject): ...@@ -167,12 +167,12 @@ class Account(BlockchainObject):
"sbd_seconds", "savings_sbd_seconds", "average_bandwidth", "lifetime_bandwidth", "lifetime_market_bandwidth", "reputation", "sbd_seconds", "savings_sbd_seconds", "average_bandwidth", "lifetime_bandwidth", "lifetime_market_bandwidth", "reputation",
] ]
for p in parse_int: 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]) output[p] = str(output[p])
if "proxied_vsf_votes" in output: if "proxied_vsf_votes" in output:
proxied_vsf_votes = [] proxied_vsf_votes = []
for p_int 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)) proxied_vsf_votes.append(str(p_int))
else: else:
proxied_vsf_votes.append(p_int) proxied_vsf_votes.append(p_int)
......
...@@ -185,7 +185,7 @@ class Comment(BlockchainObject): ...@@ -185,7 +185,7 @@ class Comment(BlockchainObject):
"author_reputation", "author_reputation",
] ]
for p in parse_int: 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]) output[p] = str(output[p])
if "active_votes" in output: if "active_votes" in output:
new_active_votes = [] new_active_votes = []
...@@ -200,7 +200,7 @@ class Comment(BlockchainObject): ...@@ -200,7 +200,7 @@ class Comment(BlockchainObject):
"rshares", "reputation", "rshares", "reputation",
] ]
for p in parse_int: 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]) vote[p] = str(vote[p])
new_active_votes.append(vote) new_active_votes.append(vote)
output["active_votes"] = new_active_votes output["active_votes"] = new_active_votes
...@@ -462,7 +462,7 @@ class Comment(BlockchainObject): ...@@ -462,7 +462,7 @@ class Comment(BlockchainObject):
else: else:
if pending_payout_value is None: if pending_payout_value is None:
pending_payout_value = Amount(self["pending_payout_value"], steem_instance=self.steem) 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) pending_payout_value = Amount(pending_payout_value, "SBD", steem_instance=self.steem)
elif isinstance(pending_payout_value, str): elif isinstance(pending_payout_value, str):
pending_payout_value = Amount(pending_payout_value, steem_instance=self.steem) pending_payout_value = Amount(pending_payout_value, steem_instance=self.steem)
......
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.19.38' version = '0.19.39'
...@@ -148,7 +148,7 @@ class Vote(BlockchainObject): ...@@ -148,7 +148,7 @@ class Vote(BlockchainObject):
"rshares", "reputation", "rshares", "reputation",
] ]
for p in parse_int: 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]) output[p] = str(output[p])
return json.loads(str(json.dumps(output))) return json.loads(str(json.dumps(output)))
......
...@@ -103,7 +103,7 @@ class Witness(BlockchainObject): ...@@ -103,7 +103,7 @@ class Witness(BlockchainObject):
"votes", "virtual_last_update", "virtual_position", "virtual_scheduled_time", "votes", "virtual_last_update", "virtual_position", "virtual_scheduled_time",
] ]
for p in parse_int: 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]) output[p] = str(output[p])
return json.loads(str(json.dumps(output))) return json.loads(str(json.dumps(output)))
......
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.19.38' version = '0.19.39'
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.19.38' version = '0.19.39'
"""THIS FILE IS GENERATED FROM beem SETUP.PY.""" """THIS FILE IS GENERATED FROM beem SETUP.PY."""
version = '0.19.38' version = '0.19.39'
...@@ -16,7 +16,7 @@ except LookupError: ...@@ -16,7 +16,7 @@ except LookupError:
ascii = codecs.lookup('ascii') ascii = codecs.lookup('ascii')
codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs')) 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'] tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment