mirror of
https://github.com/FlipsideCrypto/web3.py.git
synced 2026-02-06 10:56:47 +00:00
Merge pull request #171 from pipermerriam/piper/support-pyrlp-0.4.7
See if things explode with pyrlp 0.4.7
This commit is contained in:
commit
5cddd45ded
@ -21,6 +21,7 @@ RequestManager
|
||||
Delegated Signing Manager
|
||||
-------------------------
|
||||
|
||||
.. warning:: The ``DelegatedSigningManager`` has been deprecated and will be removed in subsequent releases.
|
||||
|
||||
.. py:class:: DelegatedSigningManager(wrapped_manager, signing_manager)
|
||||
|
||||
@ -68,6 +69,8 @@ transaction to the network using the ``eth_sendRawTransaction`` method.
|
||||
Private Key Signing Manager
|
||||
---------------------------
|
||||
|
||||
.. warning:: The ``PrivateKeySigningManager`` has been deprecated and will be removed in subsequent releases.
|
||||
|
||||
.. py:class:: PrivateKeySigningManager(wrapped_manager, keys={})
|
||||
|
||||
This manager is similar to the ``DelegatedSigningManager`` except that
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
pytest>=2.8.2
|
||||
pytest-pythonpath>=0.3
|
||||
tox>=1.8.0
|
||||
eth-testrpc>=1.1.0
|
||||
ethereum>=1.5.2
|
||||
eth-testrpc>=1.2.0
|
||||
ethereum>=1.6.1
|
||||
secp256k1>=0.13.1
|
||||
rlp>=0.4.6,<0.4.7
|
||||
hypothesis>=3.4.2
|
||||
flaky>=3.3.0
|
||||
flake8==3.0.4
|
||||
|
||||
5
setup.py
5
setup.py
@ -20,7 +20,7 @@ install_requires=[
|
||||
"pylru>=1.0.9",
|
||||
"pysha3>=0.3",
|
||||
"requests>=2.12.4",
|
||||
"rlp>=0.4.6,<0.4.7",
|
||||
"rlp>=0.4.7",
|
||||
]
|
||||
|
||||
if sys.platform == 'win32':
|
||||
@ -37,8 +37,7 @@ setup(
|
||||
include_package_data=True,
|
||||
install_requires=install_requires,
|
||||
extras_require={
|
||||
'Tester': ["eth-testrpc>=1.1.0"],
|
||||
'tester': ["eth-testrpc>=1.1.0"],
|
||||
'tester': ["eth-testrpc>=1.2.0"],
|
||||
'gevent': [
|
||||
"gevent>=1.1.1,<1.2.0",
|
||||
"geventhttpclient>=1.3.1",
|
||||
|
||||
@ -1,17 +1,18 @@
|
||||
import uuid
|
||||
import json
|
||||
import collections
|
||||
import json
|
||||
import uuid
|
||||
import warnings
|
||||
|
||||
import rlp
|
||||
|
||||
from eth_utils import (
|
||||
force_text,
|
||||
to_normalized_address,
|
||||
is_string,
|
||||
is_dict,
|
||||
encode_hex,
|
||||
decode_hex,
|
||||
encode_hex,
|
||||
force_text,
|
||||
is_dict,
|
||||
is_string,
|
||||
keccak,
|
||||
to_normalized_address,
|
||||
)
|
||||
|
||||
from web3.utils.encoding import (
|
||||
@ -82,6 +83,10 @@ class RequestManager(object):
|
||||
|
||||
class ManagerWrapper(object):
|
||||
def __init__(self, wrapped_manager):
|
||||
warnings.warn(DeprecationWarning(
|
||||
"ManagerWrapper has been deprecated and will be removed from"
|
||||
"web3.py in subsequen releases."
|
||||
))
|
||||
self.wrapped_manager = wrapped_manager
|
||||
|
||||
@property
|
||||
@ -223,6 +228,10 @@ class BaseSendRawTransactionMixin(ManagerWrapper):
|
||||
|
||||
class DelegatedSigningManager(BaseSendRawTransactionMixin):
|
||||
def __init__(self, *args, **kwargs):
|
||||
warnings.warn(DeprecationWarning(
|
||||
"DelegatedSigningManager has been deprecated and will be removed from"
|
||||
"web3.py in subsequen releases."
|
||||
))
|
||||
self.signing_manager = kwargs.pop('signing_manager')
|
||||
super(DelegatedSigningManager, self).__init__(*args, **kwargs)
|
||||
|
||||
@ -255,6 +264,10 @@ class DelegatedSigningManager(BaseSendRawTransactionMixin):
|
||||
|
||||
class PrivateKeySigningManager(BaseSendRawTransactionMixin):
|
||||
def __init__(self, *args, **kwargs):
|
||||
warnings.warn(DeprecationWarning(
|
||||
"PrivateKeySigningManager has been deprecated and will be removed from"
|
||||
"web3.py in subsequen releases."
|
||||
))
|
||||
if not is_bitcoin_available():
|
||||
raise ImportError(
|
||||
"In order to use the `PrivateKeySigningManager` the "
|
||||
|
||||
Loading…
Reference in New Issue
Block a user