Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1505: Fix / remove `sys.version` checks

9ce4e98aff JM requires Python 3.6+ currently (Kristaps Kaupe)
a85832a20c Remove deprecated check for Python 3+ (Kristaps Kaupe)

Pull request description:

  Python 2 is not supported anymore, so no need to check for Python 3+ and JM currently requires 3.6+ not 3.3+.

Top commit has no ACKs.

Tree-SHA512: 611e7da4ddc9198e9794bf8c733ccd1fe57ccecbe8230081a143738da7b1cc7b59d36ea393791abc60b923b94cd926ec36edfbd0ff3180196fe7c886c86fce94
master
Kristaps Kaupe 2 years ago
parent
commit
6c8dd42b5f
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 6
      jmdaemon/jmdaemon/orderbookwatch.py
  2. 4
      setupall.py

6
jmdaemon/jmdaemon/orderbookwatch.py

@ -69,11 +69,7 @@ class OrderbookWatch(object):
txfee, cjfee):
try:
self.dblock.acquire(True)
if sys.version_info >= (3,0):
maxint = sys.maxsize
else:
maxint = sys.maxint
if int(oid) < 0 or int(oid) > maxint:
if int(oid) < 0 or int(oid) > sys.maxsize:
log.debug("Got invalid order ID: " + oid + " from " +
counterparty)
return

4
setupall.py

@ -17,8 +17,8 @@ to libsodium.
All modes require and install twisted.
"""
if sys.version_info < (3, 3):
raise RuntimeError("This package requres Python 3.3+")
if sys.version_info < (3, 6):
raise RuntimeError("This package requres Python 3.6+")
def help():
print("Usage: python setupall.py <mode>\n"

Loading…
Cancel
Save