Skip to content

Fix compatibility with Python 3.9+ #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andreynovikov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compatibility with Python 3.9+ #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions spookymodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#include <stdio.h>
#include <string.h>
/* See https://docs.python.org/3.10/whatsnew/3.10.html#id2 */
#define PY_SSIZE_T_CLEAN
#include <Python.h>
#include "SpookyV2.h"

Expand All @@ -27,17 +29,18 @@ static PyObject *
spooky_hash128_bytes(PyObject *self, PyObject *args, PyObject *kwargs)
{
const char *message;
int message_length;
Py_ssize_t message_size;
uint64 seed[2] = {0};

static char *kwlist[] = {(char *)"message", (char *)"seed",
NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|K", kwlist,
&message, &message_length, &seed)) {
&message, &message_size, &seed)) {
return NULL;
}

int message_length = Py_SAFE_DOWNCAST(message_size, Py_ssize_t, int);
seed[1] = seed[0];

SpookyHash::Hash128(message, message_length, &seed[0], &seed[1]);
Expand All @@ -50,17 +53,18 @@ static PyObject *
spooky_hash128(PyObject *self, PyObject *args, PyObject *kwargs)
{
const char *message;
int message_length;
Py_ssize_t message_size;
uint64 seed[2] = {0};

static char *kwlist[] = {(char *)"message", (char *)"seed",
NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|K", kwlist,
&message, &message_length, &seed)) {
&message, &message_size, &seed)) {
return NULL;
}

int message_length = Py_SAFE_DOWNCAST(message_size, Py_ssize_t, int);
seed[1] = seed[0];

SpookyHash::Hash128(message, message_length, &seed[0], &seed[1]);
Expand All @@ -73,17 +77,18 @@ static PyObject *
spooky_hash64(PyObject *self, PyObject *args, PyObject *kwargs)
{
const char *message;
int message_length;
Py_ssize_t message_size;
uint64 seed[2] = {0};

static char *kwlist[] = {(char *)"message", (char *)"seed",
NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|K", kwlist,
&message, &message_length, &seed)) {
&message, &message_size, &seed)) {
return NULL;
}

int message_length = Py_SAFE_DOWNCAST(message_size, Py_ssize_t, int);
seed[1] = seed[0];

SpookyHash::Hash128(message, message_length, &seed[0], &seed[1]);
Expand All @@ -96,17 +101,18 @@ static PyObject *
spooky_hash32(PyObject *self, PyObject *args, PyObject *kwargs)
{
const char *message;
int message_length;
Py_ssize_t message_size;
uint64 seed[2] = {0};

static char *kwlist[] = {(char *)"message", (char *)"seed",
NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s#|K", kwlist,
&message, &message_length, &seed)) {
&message, &message_size, &seed)) {
return NULL;
}

int message_length = Py_SAFE_DOWNCAST(message_size, Py_ssize_t, int);
seed[1] = seed[0];

SpookyHash::Hash128(message, message_length, &seed[0], &seed[1]);
Expand Down