beemgrapheneapi is deprecated, all classes and functions are available under beemapi

.coveragerc

@@ -4,7 +4,6 @@ source =
     beem/
     beembase/
     beemapi/
-    beemgrapheneapi/
     beemgraphenebase/
 omit = 
      */.eggs/*

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(
             **{

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
 

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:

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

beemgrapheneapi/__init__.py

 """beemgrapheneapi."""
-from .version import version as __version__
-__all__ = ['graphenerpc',
-           'rpcutils']
+import sys
+sys.modules[__name__] = __import__('beemapi')
+print("beemgrapheneapi is deprecated, use beemapi instead!")

beemgrapheneapi/exceptions.py

-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

beemgrapheneapi/version.py

-"""THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.19.30'

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)
 

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)
 

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(

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

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

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