From f171821c616439c3f2138dffd199ff65ae4d0994 Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Sun, 28 Apr 2024 17:44:54 -0400
Subject: [PATCH] Fix erroneous `TypeError` from all bindings using the `s#`
 code.

As of Python 3.10, all argument codes with the `#` suffix are disabled
by default. To re-enable them, we must define `PY_SSIZE_T_CLEAN` and
change all of the types from `int` to `Py_ssize_t`. In Python 3.9 and
lower, `#` arguments expect the `int` data type by default. The macro is
backwards compatible.
---
 Python/PRP/Surface/pyMipmap.cpp | 16 +++++++++-------
 Python/PyPlasma.h               |  2 ++
 Python/Stream/pyStream.cpp      |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Python/PRP/Surface/pyMipmap.cpp b/Python/PRP/Surface/pyMipmap.cpp
index 151fd6ac..b2de29c5 100644
--- a/Python/PRP/Surface/pyMipmap.cpp
+++ b/Python/PRP/Surface/pyMipmap.cpp
@@ -124,7 +124,7 @@ PY_METHOD_VA(Mipmap, setRawImage,
     "Set the raw full image data (not for JPEG or RLE encoding)")
 {
     const char* data;
-    int dataSize;
+    Py_ssize_t dataSize;
     if (!PyArg_ParseTuple(args, "s#", &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "setRawImage expects a binary string");
         return nullptr;
@@ -138,7 +138,8 @@ PY_METHOD_VA(Mipmap, setLevel,
     "Set the image data for a specified mip level")
 {
     const char* data;
-    int dataSize, level;
+    Py_ssize_t dataSize;
+    int level;
     if (!PyArg_ParseTuple(args, "is#", &level, &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "setLevel expects int, binary string");
         return nullptr;
@@ -157,7 +158,7 @@ PY_METHOD_VA(Mipmap, setImageJPEG,
     "Set the image data as a JPEG stream")
 {
     const char* data;
-    int dataSize;
+    Py_ssize_t dataSize;
     if (!PyArg_ParseTuple(args, "s#", &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "setImageJPEG expects a binary string");
         return nullptr;
@@ -176,7 +177,7 @@ PY_METHOD_VA(Mipmap, setAlphaJPEG,
     "Set the alpha data as a JPEG stream")
 {
     const char* data;
-    int dataSize;
+    Py_ssize_t dataSize;
     if (!PyArg_ParseTuple(args, "s#", &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "setAlphaJPEG expects a binary string");
         return nullptr;
@@ -195,7 +196,7 @@ PY_METHOD_VA(Mipmap, setColorData,
     "Set the RGB color data for a JPEG mipmap")
 {
     const char* data;
-    int dataSize;
+    Py_ssize_t dataSize;
     if (!PyArg_ParseTuple(args, "s#", &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "setColorData expects a binary string");
         return nullptr;
@@ -214,7 +215,7 @@ PY_METHOD_VA(Mipmap, setAlphaData,
     "Set the alpha data for a JPEG mipmap")
 {
     const char* data;
-    int dataSize;
+    Py_ssize_t dataSize;
     if (!PyArg_ParseTuple(args, "s#", &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "setAlphaData expects a binary string");
         return nullptr;
@@ -287,7 +288,8 @@ PY_METHOD_KWARGS(Mipmap, CompressImage,
     "Compresses the specified mip level")
 {
     static char* kwlist[] = { _pycs("level"), _pycs("data"), _pycs("quality"), nullptr };
-    int level, dataSize;
+    int level;
+    Py_ssize_t dataSize;
     char* data;
     plMipmap::BlockQuality quality = plMipmap::kBlockQualityNormal;
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "is#|i", kwlist, &level, &data, &dataSize, &quality)) {
diff --git a/Python/PyPlasma.h b/Python/PyPlasma.h
index c1ccf210..55c30b1a 100644
--- a/Python/PyPlasma.h
+++ b/Python/PyPlasma.h
@@ -17,6 +17,8 @@
 #ifndef _PYPLASMA_H
 #define _PYPLASMA_H
 
+#define PY_SSIZE_T_CLEAN
+
 #include <Python.h>
 #include <PlasmaDefs.h>
 #include <Sys/Platform.h>
diff --git a/Python/Stream/pyStream.cpp b/Python/Stream/pyStream.cpp
index 532187e6..f83923e7 100644
--- a/Python/Stream/pyStream.cpp
+++ b/Python/Stream/pyStream.cpp
@@ -110,7 +110,7 @@ PY_METHOD_VA(Stream, write,
     "Writes `data` (as a binary string) to the stream")
 {
     const char* data;
-    int dataSize;
+    Py_ssize_t dataSize;
     if (!PyArg_ParseTuple(args, "s#", &data, &dataSize)) {
         PyErr_SetString(PyExc_TypeError, "write expects a binary string");
         return nullptr;