From 8b4b8ddc574fb6496242b6b1b9b355ea0ce88d53 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Fri, 10 May 2019 21:43:00 +0100
Subject: [PATCH] Use PyBytes_* Python CAPI functions
This removes any doubts about what type of string is in use.
---
src/bindings/swig/hammer.i | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/bindings/swig/hammer.i b/src/bindings/swig/hammer.i
index 7ba7be22..0097bdc7 100644
--- a/src/bindings/swig/hammer.i
+++ b/src/bindings/swig/hammer.i
@@ -1,4 +1,7 @@
%module hammer
+%begin %{
+#define SWIG_PYTHON_STRICT_BYTE_CHAR
+%}
%nodefaultctor;
@@ -83,11 +86,11 @@
PyErr_SetString(PyExc_ValueError, "Expecting a string");
return NULL;
} else {
- $1 = *(uint8_t*)PyString_AsString($input);
+ $1 = *(uint8_t*)PyBytes_AsString($input);
}
}
%typemap(out) HBytes* {
- $result = PyString_FromStringAndSize((char*)$1->token, $1->len);
+ $result = PyBytes_FromStringAndSize((char*)$1->token, $1->len);
}
%typemap(out) struct HCountedArray_* {
int i;
@@ -187,7 +190,7 @@
return PyObject_CallFunctionObjArgs(_helper_Placeholder, NULL);
break;
case TT_BYTES:
- return PyString_FromStringAndSize((char*)token->token_data.bytes.token, token->token_data.bytes.len);
+ return PyBytes_FromStringAndSize((char*)token->token_data.bytes.token, token->token_data.bytes.len);
case TT_SINT:
// TODO: return PyINT if appropriate
return PyLong_FromLong(token->token_data.sint);
--
GitLab