Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 07:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix python version check (#705)

Browse Source 
Commit 11a337f1 added major and minor python version
checking to cast.h but does not use the macros defined
via the Python.h inclusion. This may be due to an
intention to use the variables defined by the cmake
module FindPythonInterpreter, but nothing in the
pybind11 repo does anything to convert the cmake
variables to preprocessor defines.
This commit is contained in:
eirrgang 2017-03-01 04:53:38 -05:00 committed by Wenzel Jakob
parent 5143989623
commit 11c9f32c0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pybind11/cast.h
View File

@ -646,14 +646,14 @@ struct type_caster<std::basic_string<CharT, Traits, Allocator>, enable_if_t<is_s
using StringType = std::basic_string<CharT, Traits, Allocator>; using StringType = std::basic_string<CharT, Traits, Allocator>;
bool load(handle src, bool) { bool load(handle src, bool) {
#if PY_VERSION_MAJOR < 3 #if PY_MAJOR_VERSION < 3
object temp; object temp;
#endif #endif
handle load_src = src; handle load_src = src;
if (!src) { if (!src) {
return false; return false;
} else if (!PyUnicode_Check(load_src.ptr())) { } else if (!PyUnicode_Check(load_src.ptr())) {
#if PY_VERSION_MAJOR >= 3 #if PY_MAJOR_VERSION >= 3
return false; return false;
// The below is a guaranteed failure in Python 3 when PyUnicode_Check returns false // The below is a guaranteed failure in Python 3 when PyUnicode_Check returns false
#else #else