* Introduce support for Python 3 (Closes: #523645)

This is the first initial port to Python 3. The API is almost completely
identical to the one found in Python 2, except that functions working with
binary data require bytes (md5sum,sha1sum,sha256sum,Base64Encode).

Using setup3.py to install the modules will not work, because the apt package
still has to be converted to Python 3. For the package, we call 2to3-3.1 in
debian/rules to do this automatically.

1 files changed, 15 insertions, 1 deletions

diff --git a/python/string.cc b/python/string.cc
index 8168ea5b..b95ee3eb 100644
--- a/python/string.cc
+++ b/python/string.cc
@@ -38,7 +38,21 @@ PyObject *Python(PyObject *Self,PyObject *Args) \
 }
 
 MkStr(StrDeQuote,DeQuoteString);
-MkStr(StrBase64Encode,Base64Encode);
+
+/*
+ * Input bytes(Py3k)/str(Py2), output str.
+ */
+PyObject *StrBase64Encode(PyObject *Self,PyObject *Args) {
+   char *Str = 0;
+   #if PY_MAJOR_VERSION >= 3
+   if (PyArg_ParseTuple(Args,"y",&Str) == 0)
+   #else
+   if (PyArg_ParseTuple(Args,"s",&Str) == 0)
+   #endif
+      return 0;
+   return CppPyString(Base64Encode(Str));
+}
+
 MkStr(StrURItoFileName,URItoFileName);
 
 //MkFloat(StrSizeToStr,SizeToStr);