You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/10/19 06:38:16 UTC
svn commit: r1399964 -
/incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx
Author: pfg
Date: Fri Oct 19 04:38:16 2012
New Revision: 1399964
URL: http://svn.apache.org/viewvc?rev=1399964&view=rev
Log:
Python 3 unified PyInt and PyLong.
Modified:
incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx
Modified: incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx?rev=1399964&r1=1399963&r2=1399964&view=diff
==============================================================================
--- incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx (original)
+++ incubator/ooo/trunk/main/pyuno/source/module/pyuno_runtime.cxx Fri Oct 19 04:38:16 2012
@@ -662,6 +662,7 @@ Any Runtime::pyObject2Any ( const PyRef
{
}
+#if PY_MAJOR_VERSION < 3 // Python 3 has no PyInt
else if (PyInt_Check (o))
{
if( o == Py_True )
@@ -693,6 +694,7 @@ Any Runtime::pyObject2Any ( const PyRef
}
}
}
+#endif // Python 3 has no PyInt
else if (PyLong_Check (o))
{
sal_Int64 l = (sal_Int64)PyLong_AsLong (o);