Fix the incompatibility between Python2 and Python3.

google · Oct 12, 2017 · 75695aa · 75695aa
1 parent 581f593
commit 75695aa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/python/sentencepiece.i b/python/sentencepiece.i
@@ -5,6 +5,12 @@
 
 %{
 #include <sentencepiece_processor.h>
+#if PY_VERSION_HEX >= 0x03000000
+#undef PyString_Check
+#define PyString_Check(name) PyUnicode_Check(name)
+#define PyString_AsStringAndSize(obj, s, len) {*s = PyUnicode_AsUTF8AndSize(obj, len);}
+#define PyString_FromStringAndSize(s, len) PyUnicode_FromStringAndSize(s, len)
+#endif
 %}
 
 %ignore sentencepiece::SentencePieceProcessor::Encode(std::string const &, std::vector<std::string>*) const;

diff --git a/python/sentencepiece.py b/python/sentencepiece.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.11
+# Version 2.0.12
 #
 # Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.

diff --git a/python/sentencepiece_wrap.cxx b/python/sentencepiece_wrap.cxx
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.11
+ * Version 2.0.12
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -2964,7 +2964,7 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #endif
 #define SWIG_name    "_sentencepiece"
 
-#define SWIGVERSION 0x020011 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3038,6 +3038,12 @@ namespace swig {
 
 
 #include <sentencepiece_processor.h>
+#if PY_VERSION_HEX >= 0x03000000
+#undef PyString_Check
+#define PyString_Check(name) PyUnicode_Check(name)
+#define PyString_AsStringAndSize(obj, s, len) {*s = PyUnicode_AsUTF8AndSize(obj, len);}
+#define PyString_FromStringAndSize(s, len) PyUnicode_FromStringAndSize(s, len)
+#endif
 
 
 SWIGINTERNINLINE PyObject*