Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions libmc/_client.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ from libcpp.string cimport string
from libcpp.vector cimport vector
from cpython.mem cimport PyMem_Malloc, PyMem_Free
from cpython.version cimport PY_MAJOR_VERSION
from cpython cimport Py_INCREF, Py_DECREF, PyInt_AsLong, PyInt_FromLong

if PY_MAJOR_VERSION < 3:
from cpython cimport PyString_AsStringAndSize, PyString_AsString
import cPickle as pickle
else:
from cpython cimport PyBytes_AsStringAndSize as PyString_AsStringAndSize, PyBytes_AsString as PyString_AsString, PyUnicode_AsUTF8String
import pickle
from cpython cimport (
Py_INCREF, Py_DECREF,
PyLong_AsLong as PyInt_AsLong,
PyLong_FromLong as PyInt_FromLong,
PyBytes_AsStringAndSize as PyString_AsStringAndSize,
PyBytes_AsString as PyString_AsString,
PyUnicode_AsUTF8String,
)
from ctypes import c_long as long

import os
import sys
Expand All @@ -24,6 +25,7 @@ import threading
import zlib
import marshal
import warnings
import pickle
from contextlib import contextmanager

cdef extern from "Common.h" namespace "douban::mc":
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def find_version(*file_paths):
"Topic :: Software Development :: Libraries",
],
# Support for the basestring type is new in Cython 0.20.
setup_requires=["Cython >= 0.20, < 3.1"],
setup_requires=["Cython >= 0.20"],
ext_modules=[
Extension(
"libmc._client",
Expand Down