commit 36413cf92c931f47b52219eb6e85d198f6c1157c
parent 36f7c79aac52e1e15a8114c85f966b691af42f34
Author: Christian Grothoff <christian@grothoff.org>
Date: Thu, 30 Jul 2026 10:48:24 +0200
fix #10769: make taler-helper-sqlite3 run with Python 3.10 (by htgoebel)
Diffstat:
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/packages/idb-bridge/taler-helper-sqlite3 b/packages/idb-bridge/taler-helper-sqlite3
@@ -19,14 +19,10 @@ import sys
import os
import sys
-v = sys.version_info
-if v.major < 3 or (v.major == 3 and v.minor < 11):
- print(
- "FATAL: python version >=3.11 required but running on",
- sys.version,
- file=sys.stderr,
- )
- sys.exit(1)
+if sys.version_info < (3, 10):
+ raise SystemExit(
+ "FATAL: python version >=3.10 required but running on %s" %
+ sys.version)
verbose = "-v" in sys.argv
if verbose:
@@ -78,9 +74,9 @@ prep_handles = dict()
def write_resp(req_id, cmd, payload=None):
trace("sending response to request", req_id)
outlen = 4 + 4 + 1 + (0 if payload is None else len(payload))
- respstream.write(outlen.to_bytes(4))
- respstream.write(req_id.to_bytes(4))
- respstream.write(cmd.to_bytes(1))
+ respstream.write(outlen.to_bytes(4, byteorder='big'))
+ respstream.write(req_id.to_bytes(4, byteorder='big'))
+ respstream.write(cmd.to_bytes(1, byteorder='big'))
if payload is not None:
respstream.write(payload)
respstream.flush()
@@ -106,16 +102,16 @@ class PacketWriter:
self.chunks.append(buf)
def write_uint8(self, n):
- self.chunks.append(n.to_bytes(1))
+ self.chunks.append(n.to_bytes(1, byteorder='big'))
def write_uint32(self, n):
- self.chunks.append(n.to_bytes(4))
+ self.chunks.append(n.to_bytes(4, byteorder='big'))
def write_uint16(self, n):
- self.chunks.append(n.to_bytes(2))
+ self.chunks.append(n.to_bytes(2, byteorder='big'))
def write_int64(self, n):
- self.chunks.append(n.to_bytes(8, signed=True))
+ self.chunks.append(n.to_bytes(8, byteorder='big', signed=True))
def write_rowlist(self, rows, description):
self.write_uint16(len(rows))
@@ -167,17 +163,17 @@ class PacketReader:
return d
def read_uint16(self):
- d = int.from_bytes(self.data[self.pos : self.pos + 2])
+ d = int.from_bytes(self.data[self.pos : self.pos + 2], byteorder='big')
self.pos += 2
return d
def read_uint32(self):
- d = int.from_bytes(self.data[self.pos : self.pos + 4])
+ d = int.from_bytes(self.data[self.pos : self.pos + 4], byteorder='big')
self.pos += 4
return d
def read_int64(self):
- d = int.from_bytes(self.data[self.pos : self.pos + 8], signed=True)
+ d = int.from_bytes(self.data[self.pos : self.pos + 8], byteorder='big', signed=True)
self.pos += 8
return d
@@ -231,8 +227,8 @@ while True:
sys.exit(0)
elif len(buf_sz) != 4:
raise Exception("incomplete message")
- size = int.from_bytes(buf_sz)
- req_id = int.from_bytes(read_exactly(4))
+ size = int.from_bytes(buf_sz, byteorder='big')
+ req_id = int.from_bytes(read_exactly(4), byteorder='big')
rest = read_exactly(size - 8)
pr = PacketReader(rest)
cmd = pr.read_uint8()