mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-04 19:08:51 +02:00
build: Require python 3.5
This commit is contained in:
@@ -218,10 +218,7 @@ class P2PConnection(asyncio.Protocol):
|
||||
def maybe_write():
|
||||
if not self._transport:
|
||||
return
|
||||
# Python <3.4.4 does not have is_closing, so we have to check for
|
||||
# its existence explicitly as long as Bitcoin Core supports all
|
||||
# Python 3.4 versions.
|
||||
if hasattr(self._transport, 'is_closing') and self._transport.is_closing():
|
||||
if self._transport.is_closing():
|
||||
return
|
||||
self._transport.write(raw_message_bytes)
|
||||
NetworkThread.network_event_loop.call_soon_threadsafe(maybe_write)
|
||||
|
||||
@@ -449,10 +449,6 @@ class CScript(bytes):
|
||||
# join makes no sense for a CScript()
|
||||
raise NotImplementedError
|
||||
|
||||
# Python 3.4 compatibility
|
||||
def hex(self):
|
||||
return self.hex()
|
||||
|
||||
def __new__(cls, value=b''):
|
||||
if isinstance(value, bytes) or isinstance(value, bytearray):
|
||||
return super(CScript, cls).__new__(cls, value)
|
||||
|
||||
@@ -31,9 +31,6 @@ from .util import (
|
||||
p2p_port,
|
||||
)
|
||||
|
||||
# For Python 3.4 compatibility
|
||||
JSONDecodeError = getattr(json, "JSONDecodeError", ValueError)
|
||||
|
||||
BITCOIND_PROC_WAIT_TIMEOUT = 60
|
||||
|
||||
|
||||
@@ -565,5 +562,5 @@ class TestNodeCLI():
|
||||
raise subprocess.CalledProcessError(returncode, self.binary, output=cli_stderr)
|
||||
try:
|
||||
return json.loads(cli_stdout, parse_float=decimal.Decimal)
|
||||
except JSONDecodeError:
|
||||
except json.JSONDecodeError:
|
||||
return cli_stdout.rstrip("\n")
|
||||
|
||||
@@ -182,9 +182,6 @@ def check_json_precision():
|
||||
def count_bytes(hex_string):
|
||||
return len(bytearray.fromhex(hex_string))
|
||||
|
||||
def b_2_x(byte_str):
|
||||
return byte_str.hex()
|
||||
|
||||
def hash256(byte_str):
|
||||
sha256 = hashlib.sha256()
|
||||
sha256.update(byte_str)
|
||||
|
||||
Reference in New Issue
Block a user