From 951d83220a4aa00d0de69be4b13bae90ef34929a Mon Sep 17 00:00:00 2001
From: Holger Nahrstaedt <holger@nahrstaedt.de>
Date: Wed, 23 May 2018 10:08:46 +0200
Subject: [PATCH] beemgrapheneapi is deprecated, all classes and functions are
available under beemapi
---
.coveragerc | 1 -
beem/comment.py | 22 ++++++++----
beemapi/exceptions.py | 37 ++++++++++++++++++-
{beemgrapheneapi => beemapi}/graphenerpc.py | 0
{beemgrapheneapi => beemapi}/rpcutils.py | 0
beemapi/steemnoderpc.py | 13 ++++---
beemapi/websocket.py | 2 +-
beemgrapheneapi/__init__.py | 6 ++--
beemgrapheneapi/exceptions.py | 40 ---------------------
beemgrapheneapi/version.py | 2 --
examples/benchmark_nodes.py | 2 +-
examples/op_on_testnet.py | 2 +-
setup.py | 1 -
tests/beem/test_testnet.py | 2 +-
tests/beemapi/test_steemnoderpc.py | 2 +-
tox.ini | 8 ++---
16 files changed, 69 insertions(+), 71 deletions(-)
rename {beemgrapheneapi => beemapi}/graphenerpc.py (100%)
rename {beemgrapheneapi => beemapi}/rpcutils.py (100%)
delete mode 100644 beemgrapheneapi/exceptions.py
delete mode 100644 beemgrapheneapi/version.py
diff --git a/.coveragerc b/.coveragerc
index 9be67a63..5f2f69ac 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -4,7 +4,6 @@ source =
beem/
beembase/
beemapi/
- beemgrapheneapi/
beemgraphenebase/
omit =
*/.eggs/*
diff --git a/beem/comment.py b/beem/comment.py
index fc62fd74..cd3b570b 100644
--- a/beem/comment.py
+++ b/beem/comment.py
@@ -537,13 +537,21 @@ class Comment(BlockchainObject):
else:
[post_author, post_permlink] = resolve_authorperm(identifier)
- STEEMIT_100_PERCENT = 10000
- STEEMIT_1_PERCENT = (STEEMIT_100_PERCENT / 100)
- vote_weight = int(weight * STEEMIT_1_PERCENT)
- if vote_weight > STEEMIT_100_PERCENT:
- vote_weight = STEEMIT_100_PERCENT
- if vote_weight < -STEEMIT_100_PERCENT:
- vote_weight = -STEEMIT_100_PERCENT
+ steem_conf = self.steem.get_config()
+ if 'STEEMIT_100_PERCENT' in steem_conf:
+ STEEM_100_PERCENT = steem_conf['STEEMIT_100_PERCENT']
+ STEEM_1_PERCENT = steem_conf['STEEMIT_1_PERCENT']
+ elif 'STEEM_100_PERCENT' in steem_conf:
+ STEEM_100_PERCENT = steem_conf['STEEM_100_PERCENT']
+ STEEM_1_PERCENT = steem_conf['STEEM_1_PERCENT']
+ else:
+ STEEM_100_PERCENT = 10000
+ STEEM_1_PERCENT = (STEEM_100_PERCENT / 100)
+ vote_weight = int(weight * STEEM_1_PERCENT)
+ if vote_weight > STEEM_100_PERCENT:
+ vote_weight = STEEM_100_PERCENT
+ if vote_weight < -STEEM_100_PERCENT:
+ vote_weight = -STEEM_100_PERCENT
op = operations.Vote(
**{
diff --git a/beemapi/exceptions.py b/beemapi/exceptions.py
index 6d66385f..50a16c6d 100644
--- a/beemapi/exceptions.py
+++ b/beemapi/exceptions.py
@@ -4,7 +4,6 @@ from __future__ import print_function
from __future__ import unicode_literals
from builtins import str
import re
-from beemgrapheneapi.graphenerpc import RPCError, RPCErrorDoRetry, NumRetriesReached
def decodeRPCErrorMsg(e):
@@ -25,6 +24,42 @@ def decodeRPCErrorMsg(e):
return str(e)
+class UnauthorizedError(Exception):
+ """UnauthorizedError Exception."""
+
+ pass
+
+
+class RPCConnection(Exception):
+ """RPCConnection Exception."""
+
+ pass
+
+
+class RPCError(Exception):
+ """RPCError Exception."""
+
+ pass
+
+
+class RPCErrorDoRetry(Exception):
+ """RPCErrorDoRetry Exception."""
+
+ pass
+
+
+class NumRetriesReached(Exception):
+ """NumRetriesReached Exception."""
+
+ pass
+
+
+class CallRetriesReached(Exception):
+ """CallRetriesReached Exception. Only for internal use"""
+
+ pass
+
+
class MissingRequiredActiveAuthority(RPCError):
pass
diff --git a/beemgrapheneapi/graphenerpc.py b/beemapi/graphenerpc.py
similarity index 100%
rename from beemgrapheneapi/graphenerpc.py
rename to beemapi/graphenerpc.py
diff --git a/beemgrapheneapi/rpcutils.py b/beemapi/rpcutils.py
similarity index 100%
rename from beemgrapheneapi/rpcutils.py
rename to beemapi/rpcutils.py
diff --git a/beemapi/steemnoderpc.py b/beemapi/steemnoderpc.py
index 8f4fd92b..26f786d2 100644
--- a/beemapi/steemnoderpc.py
+++ b/beemapi/steemnoderpc.py
@@ -5,9 +5,8 @@ from __future__ import unicode_literals
from builtins import bytes, int, str
import re
import sys
-from beemgrapheneapi.graphenerpc import GrapheneRPC
-from beemgrapheneapi.rpcutils import sleep_and_check_retries
-from beemgrapheneapi.exceptions import CallRetriesReached
+from .graphenerpc import GrapheneRPC
+from .rpcutils import sleep_and_check_retries
from beemgraphenebase.chains import known_chains
from . import exceptions
import logging
@@ -75,22 +74,22 @@ class SteemNodeRPC(GrapheneRPC):
try:
sleep_and_check_retries(self.num_retries_call, self.error_cnt_call, self.url, str(msg), call_retry=True)
doRetry = True
- except CallRetriesReached:
+ except exceptions.CallRetriesReached:
if self.n_urls > 1:
self._retry_on_next_node(msg)
doRetry = True
else:
- raise CallRetriesReached
+ raise exceptions.CallRetriesReached
except exceptions.RPCError as e:
try:
doRetry = self._check_error_message(e, self.error_cnt_call)
- except CallRetriesReached:
+ except exceptions.CallRetriesReached:
msg = exceptions.decodeRPCErrorMsg(e).strip()
if self.n_urls > 1:
self._retry_on_next_node(msg)
doRetry = True
else:
- raise CallRetriesReached
+ raise exceptions.CallRetriesReached
except Exception as e:
raise e
if self.error_cnt_call >= self.num_retries_call:
diff --git a/beemapi/websocket.py b/beemapi/websocket.py
index ed1c0494..7ad5558c 100644
--- a/beemapi/websocket.py
+++ b/beemapi/websocket.py
@@ -13,7 +13,7 @@ import logging
import websocket
from itertools import cycle
from threading import Thread
-from beemgrapheneapi.rpcutils import (
+from beemapi.rpcutils import (
is_network_appbase_ready, sleep_and_check_retries,
get_api_name, get_query, UnauthorizedError,
RPCConnection, RPCError, NumRetriesReached
diff --git a/beemgrapheneapi/__init__.py b/beemgrapheneapi/__init__.py
index e3b6b0a2..c8671781 100644
--- a/beemgrapheneapi/__init__.py
+++ b/beemgrapheneapi/__init__.py
@@ -1,4 +1,4 @@
"""beemgrapheneapi."""
-from .version import version as __version__
-__all__ = ['graphenerpc',
- 'rpcutils']
+import sys
+sys.modules[__name__] = __import__('beemapi')
+print("beemgrapheneapi is deprecated, use beemapi instead!")
diff --git a/beemgrapheneapi/exceptions.py b/beemgrapheneapi/exceptions.py
deleted file mode 100644
index 460d6c2e..00000000
--- a/beemgrapheneapi/exceptions.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-
-class UnauthorizedError(Exception):
- """UnauthorizedError Exception."""
-
- pass
-
-
-class RPCConnection(Exception):
- """RPCConnection Exception."""
-
- pass
-
-
-class RPCError(Exception):
- """RPCError Exception."""
-
- pass
-
-
-class RPCErrorDoRetry(Exception):
- """RPCErrorDoRetry Exception."""
-
- pass
-
-
-class NumRetriesReached(Exception):
- """NumRetriesReached Exception."""
-
- pass
-
-
-class CallRetriesReached(Exception):
- """CallRetriesReached Exception. Only for internal use"""
-
- pass
diff --git a/beemgrapheneapi/version.py b/beemgrapheneapi/version.py
deleted file mode 100644
index d8467037..00000000
--- a/beemgrapheneapi/version.py
+++ /dev/null
@@ -1,2 +0,0 @@
-"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.30'
diff --git a/examples/benchmark_nodes.py b/examples/benchmark_nodes.py
index e11c2e31..a82d37b9 100644
--- a/examples/benchmark_nodes.py
+++ b/examples/benchmark_nodes.py
@@ -13,7 +13,7 @@ from beem.account import Account
from beem.block import Block
from beem.steem import Steem
from beem.utils import parse_time, formatTimedelta, get_node_list
-from beemgrapheneapi.rpcutils import NumRetriesReached
+from beemapi.exceptions import NumRetriesReached
log = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
diff --git a/examples/op_on_testnet.py b/examples/op_on_testnet.py
index b412b3fe..6171cf56 100644
--- a/examples/op_on_testnet.py
+++ b/examples/op_on_testnet.py
@@ -15,7 +15,7 @@ from beem.amount import Amount
from beemgraphenebase.account import PasswordKey, PrivateKey, PublicKey
from beem.steem import Steem
from beem.utils import parse_time, formatTimedelta
-from beemgrapheneapi.rpcutils import NumRetriesReached
+from beemapi.exceptions import NumRetriesReached
log = logging.getLogger(__name__)
logging.basicConfig(level=logging.INFO)
diff --git a/setup.py b/setup.py
index 4f2fa9d4..7d792144 100755
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,6 @@ if __name__ == '__main__':
write_version_py('beem/version.py')
write_version_py('beembase/version.py')
write_version_py('beemapi/version.py')
- write_version_py('beemgrapheneapi/version.py')
write_version_py('beemgraphenebase/version.py')
setup(
diff --git a/tests/beem/test_testnet.py b/tests/beem/test_testnet.py
index ece20bf5..d2ab4c97 100644
--- a/tests/beem/test_testnet.py
+++ b/tests/beem/test_testnet.py
@@ -20,7 +20,7 @@ from beem.transactionbuilder import TransactionBuilder
from beembase.operations import Transfer
from beemgraphenebase.account import PasswordKey, PrivateKey, PublicKey
from beem.utils import parse_time, formatTimedelta
-from beemgrapheneapi.rpcutils import NumRetriesReached
+from beemapi.rpcutils import NumRetriesReached
# Py3 compatibility
import sys
diff --git a/tests/beemapi/test_steemnoderpc.py b/tests/beemapi/test_steemnoderpc.py
index f7ce5624..17ff3877 100644
--- a/tests/beemapi/test_steemnoderpc.py
+++ b/tests/beemapi/test_steemnoderpc.py
@@ -15,7 +15,7 @@ from beem import Steem
from beemapi.steemnoderpc import SteemNodeRPC
from beemapi.websocket import SteemWebsocket
from beemapi import exceptions
-from beemgrapheneapi.exceptions import NumRetriesReached, CallRetriesReached
+from beemapi.exceptions import NumRetriesReached, CallRetriesReached
from beem.instance import set_shared_steem_instance
# Py3 compatibility
import sys
diff --git a/tox.ini b/tox.ini
index 97b55314..8dfd5129 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,14 +54,14 @@ deps=
# pep8-naming
# flake8-colors
commands=
- flake8 beem beemapi beembase beemgraphenebase beemgrapheneapi setup.py examples tests
+ flake8 beem beemapi beembase beemgraphenebase setup.py examples tests
[testenv:pylint]
deps=
pyflakes
pylint
commands=
- pylint beem beemapi beembase beemgraphenebase beemgrapheneapi tests
+ pylint beem beemapi beembase beemgraphenebase tests
[testenv:doc8]
skip_install = true
@@ -76,7 +76,7 @@ skip_install = true
deps =
mypy-lang
commands =
- mypy beem beemapi beembase beemgraphenebase beemgrapheneapi
+ mypy beem beemapi beembase beemgraphenebase
[testenv:bandit]
@@ -84,7 +84,7 @@ skip_install = true
deps =
bandit
commands =
- bandit -r beem beemapi beembase beemgraphenebase beemgrapheneapi -c .bandit.yml
+ bandit -r beem beemapi beembase beemgraphenebase -c .bandit.yml
[testenv:linters]
skip_install = true
--
GitLab