mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port PyUno to support Python 3

Browse Source
This commit is contained in:
Andreas Becker
2011-05-07 20:35:03 +01:00
committed by Michael Meeks
parent 7cf799064f
commit a09ce46818
23 changed files with 641 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pyuno/demo/biblioaccess.py
View File

@@ -1,9 +1,9 @@
import uno
# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
import uno
from com.sun.star.sdb.CommandType import COMMAND
def main():
connectionString = "socket,host=localhost,port=2002"
url = "uno:" + connectionString + ";urp;StarOffice.ComponentContext"
@@ -22,14 +22,15 @@ def main():
rowset.execute();
print "Identifier\tAuthor"
print("Identifier\tAuthor")
id = rowset.findColumn("IDENTIFIER")
author = rowset.findColumn("AUTHOR")
while rowset.next():
print rowset.getString( id ) + "\t" + repr( rowset.getString( author ) )
print(rowset.getString(id) + "\t" + repr(rowset.getString(author)))
rowset.dispose();
main()
# vim:set shiftwidth=4 softtabstop=4 expandtab:

5
pyuno/demo/hello_world_comp.py
View File

@@ -1,3 +1,5 @@
# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
import uno
import unohelper
@@ -32,9 +34,10 @@ class HelloWorldJob( unohelper.Base, XJobExecutor ):
# pythonloader looks for a static g_ImplementationHelper variable
g_ImplementationHelper = unohelper.ImplementationHelper()
#
g_ImplementationHelper.addImplementation( \
HelloWorldJob, # UNO object class
"org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name
("com.sun.star.task.Job",),) # list of implemented services
# (the only service)
# vim:set shiftwidth=4 softtabstop=4 expandtab:

2
pyuno/demo/makefile.mk
View File

@@ -6,7 +6,6 @@ PRJ=..
ROOT=$(MISC)$/pyuno-doc
FILES=\
$(ROOT)$/python-bridge.html \
$(ROOT)$/customized_setup.png \
@@ -22,7 +21,6 @@ FILES=\
$(ROOT)$/samples$/hello_world_pyuno.zip
$(MISC)$/pyuno-doc.zip : dirs $(FILES)
-rm -f $@
cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc

17
pyuno/demo/ooextract.py
View File

@@ -1,3 +1,5 @@
# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
import getopt,sys
import uno
from unohelper import Base,systemPathToFileUrl, absolutize
@@ -21,7 +23,6 @@ class OutputStream( Base, XOutputStream ):
def flush(self):
pass
def main():
retVal = 0
doc = None
@@ -40,7 +41,7 @@ def main():
if o == "--html":
filterName = "HTML (StarWriter)"
print filterName
print(filterName)
if not len(args):
usage()
sys.exit()
@@ -66,22 +67,22 @@ def main():
doc = desktop.loadComponentFromURL(fileUrl , "_blank", 0, inProps)
if not doc:
raise UnoException( "Couldn't open stream for unknown reason", None )
raise UnoException("Could not open stream for unknown reason", None)
doc.storeToURL("private:stream", outProps)
except IOException, e:
except IOException as e:
sys.stderr.write("Error during conversion: " + e.Message + "\n")
retVal = 1
except UnoException, e:
except UnoException as e:
sys.stderr.write("Error (" + repr(e.__class__) + ") during conversion: " + e.Message + "\n")
retVal = 1
if doc:
doc.dispose()
except UnoException, e:
except UnoException as e:
sys.stderr.write("Error (" + repr(e.__class__) + "): " + e.Message + "\n")
retVal = 1
except getopt.GetoptError,e:
except getopt.GetoptError as e:
sys.stderr.write(str(e) + "\n")
usage()
retVal = 1
@@ -107,3 +108,5 @@ def usage():
)
main()
# vim:set shiftwidth=4 softtabstop=4 expandtab:

2
pyuno/demo/pyunoenv.tcsh
View File

@@ -28,3 +28,5 @@ setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
if( $?PYTHONHOME ) then
setenv PATH $PYTHONHOME/bin:$PATH
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:

13
pyuno/demo/swriter.py
View File

@@ -1,8 +1,10 @@
# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# bootstrap uno component context
import uno
import unohelper
from com.sun.star.lang import IllegalArgumentException
# a UNO struct later needed to create a document
from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
@@ -46,10 +48,10 @@ table.initialize( 4,4)
text.insertTextContent( cursor, table, 0 )
rows = table.Rows
table.setPropertyValue( "BackTransparent", uno.Bool(0) )
table.setPropertyValue( "BackTransparent", False )
table.setPropertyValue( "BackColor", 13421823 )
row = rows.getByIndex(0)
row.setPropertyValue( "BackTransparent", uno.Bool(0) )
row.setPropertyValue( "BackTransparent", False )
row.setPropertyValue( "BackColor", 6710932 )
textColor = 16777215
@@ -79,7 +81,7 @@ table.getCellByName("D4").setFormula("sum <A4:C4>")
cursor.setPropertyValue( "CharColor", 255 )
cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
cursor.setPropertyValue( "CharShadowed", True )
text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
@@ -99,7 +101,8 @@ textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the he
text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
cursor.setPropertyValue( "CharColor", 65536 )
cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
cursor.setPropertyValue( "CharShadowed", False )
text.insertString( cursor, " That's all for now !!" , 0 )
text.insertString( cursor, " That's all for now!" , 0 )
# vim:set shiftwidth=4 softtabstop=4 expandtab:

8
pyuno/demo/swritercomp.py
View File

@@ -1,3 +1,5 @@
# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
# just a simple copy of the swriter.py demo, but implemented as a component. The advantage is,
# that the component may run within the office process which may give a performance improvement.
@@ -26,7 +28,6 @@ class SWriterComp(XMain,unohelper.Base):
# implementation for XMain.run( [in] sequence< any > )
def run( self,args ):
ctx = self.ctx
smgr = ctx.ServiceManager
desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
@@ -102,11 +103,12 @@ class SWriterComp(XMain,unohelper.Base):
cursor.setPropertyValue( "CharColor", 65536 )
cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
text.insertString( cursor, " That's all for now !!" , 0 )
text.insertString( cursor, " That's all for now!" , 0 )
return 0
# pythonloader looks for a static g_ImplementationHelper variable
g_ImplementationHelper = unohelper.ImplementationHelper()
g_ImplementationHelper.addImplementation( \
SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
# vim:set shiftwidth=4 softtabstop=4 expandtab:

4
pyuno/demo/swritercompclient.py
View File

@@ -1,4 +1,5 @@
# instantiating
# -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
import uno
localContext = uno.getComponentContext()
@@ -11,3 +12,4 @@ pyComp = remoteSmgr.createInstanceWithContext( "org.openoffice.demo.SWriter" , r
pyComp.run( (), )
# vim:set shiftwidth=4 softtabstop=4 expandtab:

8
pyuno/inc/pyuno/pyuno.hxx
View File

@@ -45,8 +45,12 @@
preconditions: python has been initialized before and
the global interpreter lock is held
*/
extern "C" PY_DLLEXPORT void SAL_CALL initpyuno();
extern "C" PY_DLLEXPORT
#if PY_MAJOR_VERSION >= 3
PyObject* SAL_CALL PyInit_pyuno();
#else
void SAL_CALL initpyuno();
#endif
namespace pyuno
{

22
pyuno/source/loader/pythonloader.py
View File

@@ -49,16 +49,16 @@ g_loadedComponents = {}
def checkForPythonPathBesideComponent( url ):
path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
if DEBUG == 1:
print "checking for existence of " + encfile( path )
print("checking for existence of " + encfile( path ))
if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
if DEBUG == 1:
print "adding " + encfile( path ) + " to sys.path"
print("adding " + encfile( path ) + " to sys.path")
sys.path.append( path )
path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
if DEBUG == 1:
print "adding " + encfile( path ) + " to sys.path"
print("adding " + encfile( path ) + " to sys.path")
sys.path.append( path )
def encfile(uni):
@@ -67,12 +67,12 @@ def encfile(uni):
class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
def __init__(self, ctx ):
if DEBUG:
print "pythonloader.Loader ctor"
print("pythonloader.Loader ctor")
self.ctx = ctx
def getModuleFromUrl( self, url ):
if DEBUG:
print "pythonloader: interpreting url " +url
print("pythonloader: interpreting url " + url)
protocol, dependent = splitUrl( url )
if "vnd.sun.star.expand" == protocol:
exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" )
@@ -80,7 +80,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
protocol,dependent = splitUrl( url )
if DEBUG:
print "pythonloader: after expansion " +protocol +":" + dependent
print("pythonloader: after expansion " + protocol + ":" + dependent)
try:
if "file" == protocol:
@@ -104,7 +104,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
# compile and execute the module
codeobject = compile( src, encfile(filename), "exec" )
exec codeobject in mod.__dict__
exec(codeobject, mod.__dict__)
mod.__file__ = encfile(filename)
g_loadedComponents[url] = mod
return mod
@@ -113,13 +113,13 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
else:
raise RuntimeException( "PythonLoader: Unknown protocol " +
protocol + " in url " +url, self )
except ImportError, e:
except ImportError as e:
raise RuntimeException( "Couldn't load " + url + " for reason " + str(e), None )
return None
def activate( self, implementationName, dummy, locationUrl, regKey ):
if DEBUG:
print "pythonloader.Loader.activate"
print("pythonloader.Loader.activate")
mod = self.getModuleFromUrl( locationUrl )
implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
@@ -130,7 +130,7 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
def writeRegistryInfo( self, regKey, dummy, locationUrl ):
if DEBUG:
print "pythonloader.Loader.writeRegistryInfo"
print( "pythonloader.Loader.writeRegistryInfo" )
mod = self.getModuleFromUrl( locationUrl )
implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
@@ -147,5 +147,3 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
def getSupportedServiceNames( self ):
return g_supportedServices

28
pyuno/source/loader/pyuno_loader.cxx
View File

@@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*nd '!=' comparisions are defined"126G -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,8 +118,26 @@ static void setPythonHome ( const OUString & pythonHome )
OUString systemPythonHome;
osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
rtl_string_acquire(o.pData); // leak this string (thats the api!)
#if PY_MAJOR_VERSION >= 3
// static because Py_SetPythonHome just copies the "wide" pointer
// PATH_MAX is defined in Python.h
static wchar_t wide[PATH_MAX + 1];
size_t len = mbstowcs(wide, o.pData->buffer, PATH_MAX + 1);
if(len == (size_t)-1)
{
PyErr_SetString(PyExc_SystemError, "invalid multibyte sequence in python home path");
return;
}
if(len == PATH_MAX + 1)
{
PyErr_SetString(PyExc_SystemError, "python home path is too long");
return;
}
Py_SetPythonHome(wide);
#else
rtl_string_acquire(o.pData); // increase reference count
Py_SetPythonHome(o.pData->buffer);
#endif
}
static void prependPythonPath( const OUString & pythonPathBootstrap )
@@ -178,7 +196,11 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
if( pythonPath.getLength() )
prependPythonPath( pythonPath );
#if PY_MAJOR_VERSION >= 3
PyImport_AppendInittab( "pyuno", PyInit_pyuno );
#else
PyImport_AppendInittab( "pyuno", initpyuno );
#endif
// initialize python
Py_Initialize();
PyEval_InitThreads();

42
pyuno/source/module/makefile.mk
View File

@@ -36,6 +36,7 @@ LINKFLAGSDEFS = # do not fail with missing symbols
.INCLUDE : settings.mk
.IF "$(L10N_framework)"==""
#-------------------------------------------------------------------
.IF "$(OS)$(COMEX)" == "SOLARIS4"
@@ -49,9 +50,6 @@ EXTRA_FRAMEWORK_FLAG=-framework Python
.ENDIF # .IF "$(EXTRA_CFLAGS)"!=""
.IF "$(GUI)" == "UNX"
# python expects modules without the lib prefix
# pyuno.so even on Mac OS X, because it is a python module
PYUNO_MODULE=$(DLLDEST)$/pyuno.so
PYUNORC=pyunorc
.ELSE
.INCLUDE : pyversion.mk
@@ -85,7 +83,6 @@ NOOPTFILES= \
$(SLO)$/pyuno_module.obj
.ENDIF # "$(COM)"=="GCC"
SHL1STDLIBS= \
$(CPPULIB) \
$(CPPUHELPERLIB) \
@@ -110,7 +107,6 @@ DEFLIB1NAME=$(TARGET)
ALLTAR : \
$(DLLDEST)$/uno.py \
$(DLLDEST)$/unohelper.py \
$(PYUNO_MODULE) \
$(MISC)$/$(PYUNORC) \
$(LB)$/lib$(TARGET).a
@@ -120,8 +116,8 @@ $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
ALLTAR : \
$(DLLDEST)$/uno.py \
$(DLLDEST)$/unohelper.py \
$(PYUNO_MODULE) \
$(MISC)$/$(PYUNORC)
$(MISC)$/$(PYUNORC) \
$(LB)$/$(TARGET)$(DLLPOST)
.ENDIF
.ENDIF
@@ -130,31 +126,6 @@ ALLTAR : \
$(DLLDEST)$/%.py: %.py
cp $? $@
.IF "$(GUI)" == "UNX"
$(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj
.IF "$(OS)" == "LINUX"
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "SOLARIS"
@echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "FREEBSD"
@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "NETBSD"
@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "OPENBSD"
@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "DRAGONFLY"
@echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ELIF "$(OS)" == "MACOSX"
@echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd
.ELSE
@echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd
.ENDIF
cat $(MISC)$/$(@:b).cmd
@+source $(MISC)$/$(@:b).cmd
.ENDIF
$(MISC)$/$(PYUNORC) : pyuno
-rm -f $@
cat pyuno > $@
@@ -162,5 +133,12 @@ $(MISC)$/$(PYUNORC) : pyuno
$(MISC)$/pyuno.flt : pyuno.flt
-rm -f $@
cat $? > $@
# python does not accept the "lib" prefix in the module library
$(LB)$/$(TARGET)$(DLLPOST) : $(LB)$/$(DLLPRE)$(TARGET)$(DLLPOST)
-rm -f $@
ln -s $? $@
.ENDIF # L10N_framework
# vim:set shiftwidth=4 softtabstop=4 expandtab:

37
pyuno/source/module/pyuno.cxx
View File

@@ -135,13 +135,6 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
}
case typelib_TypeClass_UNION:
{
// typelib_TypeDescription * pTypeDescr = 0;
// TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
// buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("{ ") );
// buf.append( val2str( (char *)pVal + ((typelib_UnionTypeDescription *)pTypeDescr)->nValueOffset,
// union_getSetType( pVal, pTypeDescr ) ) );
// buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" }") );
// TYPELIB_DANGER_RELEASE( pTypeDescr );
break;
}
case typelib_TypeClass_STRUCT:
@@ -600,11 +593,17 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
}
// ensure object identity and struct equality
static int PyUNO_cmp( PyObject *self, PyObject *that )
static PyObject* PyUNO_cmp( PyObject *self, PyObject *that, int op )
{
if( self == that )
if(op != Py_EQ && op != Py_NE)
{
PyErr_SetString(PyExc_TypeError, "only '==' and '!=' comparisions are defined");
return 0;
int retDefault = self > that ? 1 : -1;
}
if( self == that )
{
return (op == Py_EQ ? Py_True : Py_False);
}
try
{
Runtime runtime;
@@ -624,13 +623,16 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
if( xMe->getMaterial() == xOther->getMaterial() )
return 0;
{
return (op == Py_EQ ? Py_True : Py_False);
}
}
else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
{
if( me->members->wrappedObject == other->members->wrappedObject )
// if( me->members->xInvocation == other->members->xInvocation )
return 0;
{
return (op == Py_EQ ? Py_True : Py_False);
}
}
}
}
@@ -639,13 +641,12 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
{
raisePyExceptionWithAny( makeAny( e ) );
}
return retDefault;
return Py_False;
}
static PyTypeObject PyUNOType =
{
PyObject_HEAD_INIT (&PyType_Type)
0,
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
const_cast< char * >("pyuno"),
sizeof (PyUNO),
0,
@@ -653,7 +654,7 @@ static PyTypeObject PyUNOType =
(printfunc) 0,
(getattrfunc) PyUNO_getattr,
(setattrfunc) PyUNO_setattr,
(cmpfunc) PyUNO_cmp,
0,
(reprfunc) PyUNO_repr,
0,
0,
@@ -668,7 +669,7 @@ static PyTypeObject PyUNOType =
NULL,
(traverseproc)0,
(inquiry)0,
(richcmpfunc)0,
(richcmpfunc) PyUNO_cmp,
0,
(getiterfunc)0,
(iternextfunc)0,

5
pyuno/source/module/pyuno_callable.cxx
View File

@@ -196,8 +196,7 @@ PyObject* PyUNO_callable_call (PyObject* self, PyObject* args, PyObject*)
static PyTypeObject PyUNO_callable_Type =
{
PyObject_HEAD_INIT (&PyType_Type)
0,
PyVarObject_HEAD_INIT( &PyType_Type, 0 )
const_cast< char * >("PyUNO_callable"),
sizeof (PyUNO_callable),
0,
@@ -205,7 +204,7 @@ static PyTypeObject PyUNO_callable_Type =
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
(cmpfunc) 0,
0,
(reprfunc) 0,
0,
0,

2
pyuno/source/module/pyuno_except.cxx
View File

@@ -167,7 +167,7 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
PyTuple_SetItem( args.get(), 2, PyDict_New() );
PyRef ret(
PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()),
PyObject_CallObject(reinterpret_cast<PyObject *>(&PyType_Type) , args.get()),
SAL_NO_ACQUIRE );
// now overwrite ctor and attrib functions

48
pyuno/source/module/pyuno_impl.hxx
View File

@@ -28,6 +28,8 @@
#ifndef _PYUNO_IMPL_
#define _PYUNO_IMPL_
#include <Python.h>
#include <pyuno/pyuno.hxx>
#include <boost/unordered_map.hpp>
@@ -48,6 +50,49 @@
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weakref.hxx>
// In Python 3, the PyString_* functions have been replaced by PyBytes_*
// and PyUnicode_* functions.
#if PY_MAJOR_VERSION >= 3
inline char* PyString_AsString(PyObject *object)
{
// check whether object is already of type "PyBytes"
if(PyBytes_Check(object))
{
return PyBytes_AsString(object);
}
// object is not encoded yet, so encode it to utf-8
PyObject *pystring;
pystring = PyUnicode_AsUTF8String(object);
if(!pystring)
{
PyErr_SetString(PyExc_ValueError, "cannot utf-8 decode string");
return 0;
}
return PyBytes_AsString(pystring);
}
inline PyObject* PyString_FromString(const char *string)
{
return PyUnicode_FromString(string);
}
inline int PyString_Check(PyObject *object)
{
return PyBytes_Check(object);
}
inline Py_ssize_t PyString_Size(PyObject *object)
{
return PyBytes_Size(object);
}
inline PyObject* PyString_FromStringAndSize(const char *string, Py_ssize_t len)
{
return PyBytes_FromStringAndSize(string, len);
}
#endif /* PY_MAJOR_VERSION >= 3 */
namespace pyuno
{
@@ -142,9 +187,6 @@ com::sun::star::uno::Any PyObjectToAny (PyObject* o)
void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
throw ( com::sun::star::reflection::InvocationTargetException );
// bool CheckPyObjectTypes (PyObject* o, Sequence<Type> types);
// bool CheckPyObjectType (PyObject* o, Type type); //Only check 1 object.
com::sun::star::uno::TypeClass StringToTypeClass (char* string);
PyRef PyUNO_callable_new (

77
pyuno/source/module/pyuno_module.cxx
View File

@@ -244,7 +244,6 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args )
{
Any IdlStruct;
PyRef ret;
try
{
Runtime runtime;
@@ -253,7 +252,9 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args )
PyObject *structName = PyTuple_GetItem(args, 0);
PyObject *initializer = PyTuple_GetItem(args, 1);
if( PyString_Check( structName ) )
// Perhaps in Python 3, only PyUnicode_Check returns true and
// in Python 2, only PyString_Check returns true.
if(PyString_Check(structName) || PyUnicode_Check(structName))
{
if( PyTuple_Check( initializer ) )
{
@@ -491,9 +492,9 @@ static PyObject *isInterface( PyObject *, PyObject *args )
{
PyObject *obj = PyTuple_GetItem( args, 0 );
Runtime r;
return PyInt_FromLong( isInterfaceClass( r, obj ) );
return PyLong_FromLong( isInterfaceClass( r, obj ) );
}
return PyInt_FromLong( 0 );
return PyLong_FromLong( 0 );
}
static PyObject * generateUuid( PyObject *, PyObject * )
@@ -598,19 +599,20 @@ static PyObject * invoke ( PyObject *, PyObject * args )
if(PyTuple_Check(args) && PyTuple_Size(args) == 3)
{
PyObject *object = PyTuple_GetItem(args, 0);
if( PyString_Check( PyTuple_GetItem( args, 1 ) ) )
PyObject *item1 = PyTuple_GetItem(args, 1);
if(PyString_Check(item1) || PyUnicode_Check(item1))
{
const char *name = PyString_AsString( PyTuple_GetItem( args, 1 ) );
if( PyTuple_Check( PyTuple_GetItem( args , 2 )))
const char *name = PyString_AsString(item1);
PyObject *item2 = PyTuple_GetItem(args, 2);
if(PyTuple_Check(item2))
{
ret = PyUNO_invoke( object, name , PyTuple_GetItem( args, 2 ) );
ret = PyUNO_invoke(object, name, item2);
}
else
{
OStringBuffer buf;
buf.append("uno.invoke expects a tuple as 3rd argument, got ");
buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 2) ) ) );
buf.append(PyString_AsString(PyObject_Str(item2)));
PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
}
}
@@ -618,7 +620,7 @@ static PyObject * invoke ( PyObject *, PyObject * args )
{
OStringBuffer buf;
buf.append("uno.invoke expected a string as 2nd argument, got ");
buf.append( PyString_AsString( PyObject_Str( PyTuple_GetItem( args, 1) ) ) );
buf.append(PyString_AsString(PyObject_Str(item1)));
PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
}
}
@@ -690,31 +692,52 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
struct PyMethodDef PyUNOModule_methods [] =
{
{const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL},
{const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL},
{const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL},
{const_cast< char * >("getConstantByName"), getConstantByName,1, NULL},
{const_cast< char * >("getClass"), getClass,1, NULL},
{const_cast< char * >("checkEnum"), checkEnum, 1, NULL},
{const_cast< char * >("checkType"), checkType, 1, NULL},
{const_cast< char * >("generateUuid"), generateUuid,0, NULL},
{const_cast< char * >("systemPathToFileUrl"),systemPathToFileUrl,1, NULL},
{const_cast< char * >("fileUrlToSystemPath"),fileUrlToSystemPath,1, NULL},
{const_cast< char * >("absolutize"),absolutize,2, NULL},
{const_cast< char * >("isInterface"),isInterface,1, NULL},
{const_cast< char * >("invoke"),invoke, 2, NULL},
{const_cast< char * >("setCurrentContext"),setCurrentContext,1, NULL},
{const_cast< char * >("getCurrentContext"),getCurrentContext,1, NULL},
{const_cast< char * >("getComponentContext"), getComponentContext, METH_VARARGS, NULL},
{const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, METH_VARARGS | METH_KEYWORDS, NULL},
{const_cast< char * >("getTypeByName"), getTypeByName, METH_VARARGS, NULL},
{const_cast< char * >("getConstantByName"), getConstantByName, METH_VARARGS, NULL},
{const_cast< char * >("getClass"), getClass, METH_VARARGS, NULL},
{const_cast< char * >("checkEnum"), checkEnum, METH_VARARGS, NULL},
{const_cast< char * >("checkType"), checkType, METH_VARARGS, NULL},
{const_cast< char * >("generateUuid"), generateUuid, METH_VARARGS, NULL},
{const_cast< char * >("systemPathToFileUrl"), systemPathToFileUrl, METH_VARARGS, NULL},
{const_cast< char * >("fileUrlToSystemPath"), fileUrlToSystemPath, METH_VARARGS, NULL},
{const_cast< char * >("absolutize"), absolutize, METH_VARARGS | METH_KEYWORDS, NULL},
{const_cast< char * >("isInterface"), isInterface, METH_VARARGS, NULL},
{const_cast< char * >("invoke"), invoke, METH_VARARGS | METH_KEYWORDS, NULL},
{const_cast< char * >("setCurrentContext"), setCurrentContext, METH_VARARGS, NULL},
{const_cast< char * >("getCurrentContext"), getCurrentContext, METH_VARARGS, NULL},
{NULL, NULL, 0, NULL}
};
}
extern "C" PY_DLLEXPORT void initpyuno()
extern "C" PY_DLLEXPORT
#if PY_MAJOR_VERSION >= 3
PyObject* PyInit_pyuno()
{
// noop when called already, otherwise needed to allow multiple threads
PyEval_InitThreads();
static struct PyModuleDef moduledef =
{
PyModuleDef_HEAD_INIT,
"pyuno", // module name
0, // module documentation
-1, // module keeps state in global variables,
PyUNOModule_methods, // modules methods
0, // m_reload (must be 0)
0, // m_traverse
0, // m_clear
0, // m_free
};
return PyModule_Create(&moduledef);
}
#else
void initpyuno()
{
PyEval_InitThreads();
Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
}
#endif /* PY_MAJOR_VERSION >= 3 */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

36
pyuno/source/module/pyuno_runtime.cxx
View File

@@ -72,8 +72,7 @@ namespace pyuno
static PyTypeObject RuntimeImpl_Type =
{
PyObject_HEAD_INIT (&PyType_Type)
0,
PyVarObject_HEAD_INIT (&PyType_Type, 0)
const_cast< char * >("pyuno_runtime"),
sizeof (RuntimeImpl),
0,
@@ -81,7 +80,7 @@ static PyTypeObject RuntimeImpl_Type =
(printfunc) 0,
(getattrfunc) 0,
(setattrfunc) 0,
(cmpfunc) 0,
0,
(reprfunc) 0,
0,
0,
@@ -445,7 +444,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
{
sal_Int32 l = 0;
a >>= l;
return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE );
return PyRef( PyLong_FromLong (l), SAL_NO_ACQUIRE );
}
case typelib_TypeClass_UNSIGNED_LONG:
{
@@ -666,6 +665,8 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
{
}
// In Python 3, there is no PyInt type.
#if PY_MAJOR_VERSION < 3
else if (PyInt_Check (o))
{
if( o == Py_True )
@@ -680,7 +681,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
}
else
{
sal_Int32 l = (sal_Int32) PyInt_AsLong( o );
sal_Int32 l = (sal_Int32) PyLong_AsLong( o );
if( l < 128 && l >= -128 )
{
sal_Int8 b = (sal_Int8 ) l;
@@ -697,8 +698,24 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
}
}
}
#endif /* PY_MAJOR_VERSION < 3 */
else if (PyLong_Check (o))
{
#if PY_MAJOR_VERSION >= 3
// Convert the Python 3 booleans that are actually of type PyLong.
if(o == Py_True)
{
sal_Bool b = sal_True;
a = Any(&b, getBooleanCppuType());
}
else if(o == Py_False)
{
sal_Bool b = sal_False;
a = Any(&b, getBooleanCppuType());
}
else
{
#endif /* PY_MAJOR_VERSION >= 3 */
sal_Int64 l = (sal_Int64)PyLong_AsLong (o);
if( l < 128 && l >= -128 )
{
@@ -720,16 +737,19 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
{
a <<= l;
}
#if PY_MAJOR_VERSION >= 3
}
#endif
}
else if (PyFloat_Check (o))
{
double d = PyFloat_AsDouble (o);
a <<= d;
}
else if (PyString_Check (o))
a <<= pyString2ustring(o);
else if( PyUnicode_Check( o ) )
else if (PyString_Check(o) || PyUnicode_Check(o))
{
a <<= pyString2ustring(o);
}
else if (PyTuple_Check (o))
{
Sequence<Any> s (PyTuple_Size (o));

29
pyuno/source/module/uno.py
View File

@@ -27,7 +27,12 @@
import sys
import pyuno
try:
import __builtin__
except ImportError:
import builtins as __builtin__
import socket # since on Windows sal3.dll no longer calls WSAStartup
# all functions and variables starting with a underscore (_) must be considered private
@@ -149,9 +154,9 @@ class Bool(object):
Note: This class is deprecated. Use python's True and False directly instead
"""
def __new__(cls, value):
if isinstance(value, (str, unicode)) and value == "true":
if isinstance(value, str) and value == "true":
return True
if isinstance(value, (str, unicode)) and value == "false":
if isinstance(value, str) and value == "false":
return False
if value:
return True
@@ -161,7 +166,7 @@ class Char:
"Represents a UNO char, use an instance of this class to explicitly pass a char to UNO"
# @param value pass a Unicode string with length 1
def __init__(self,value):
assert isinstance(value, unicode)
assert isinstance(value, str)
assert len(value) == 1
self.value=value
@@ -169,7 +174,7 @@ class Char:
return "<Char instance %s>" % (self.value, )
def __eq__(self, that):
if isinstance(that, (str, unicode)):
if isinstance(that, str):
if len(that) > 1:
return False
return self.value == that[0]
@@ -260,7 +265,7 @@ def _uno_import( name, *optargs, **kwargs ):
mod = None
d = sys.modules
for x in modnames:
if d.has_key(x):
if x in d:
mod = d[x]
else:
mod = pyuno.__class__(x) # How to create a module ??
@@ -268,25 +273,25 @@ def _uno_import( name, *optargs, **kwargs ):
RuntimeException = pyuno.getClass( "com.sun.star.uno.RuntimeException" )
for x in fromlist:
if not d.has_key(x):
if x not in d:
if x.startswith( "typeOf" ):
try:
d[x] = pyuno.getTypeByName( name + "." + x[6:len(x)] )
except RuntimeException,e:
except RuntimeException as e:
raise ImportError( "type " + name + "." + x[6:len(x)] +" is unknown" )
else:
try:
# check for structs, exceptions or interfaces
d[x] = pyuno.getClass( name + "." + x )
except RuntimeException,e:
except RuntimeException as e:
# check for enums
try:
d[x] = Enum( name , x )
except RuntimeException,e2:
except RuntimeException as e2:
# check for constants
try:
d[x] = getConstantByName( name + "." + x )
except RuntimeException,e3:
except RuntimeException as e3:
# no known uno type !
raise ImportError( "type "+ name + "." +x + " is unknown" )
return mod
@@ -296,7 +301,7 @@ __builtin__.__dict__["__import__"] = _uno_import
# private function, don't use
def _impl_extractName(name):
r = range (len(name)-1,0,-1)
r = list(range(len(name)-1,0,-1))
for i in r:
if name[i] == ".":
name = name[i+1:len(name)]
@@ -336,7 +341,7 @@ def _uno_extract_printable_stacktrace( trace ):
mod = None
try:
mod = __import__("traceback")
except ImportError,e:
except ImportError as e:
pass
ret = ""
if mod:

6
pyuno/source/module/unohelper.py
View File

@@ -144,7 +144,7 @@ class ImplementationHelper:
self.impls[implementationName] = _ImplementationHelperEntry(ctor,serviceNames)
def writeRegistryInfo( self, regKey, smgr ):
for i in self.impls.items():
for i in list(self.impls.items()):
keyName = "/"+ i[0] + "/UNO/SERVICES"
key = regKey.createKey( keyName )
for serviceName in i[1].serviceNames:
@@ -231,7 +231,7 @@ def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls,
_g_typeTable = {}
def _unohelper_getHandle( self):
ret = None
if _g_typeTable.has_key( self.__class__ ):
if self.__class__ in _g_typeTable:
ret = _g_typeTable[self.__class__]
else:
names = {}
@@ -245,7 +245,7 @@ def _unohelper_getHandle( self):
# the "else if", because we only need the most derived interface
traverse = traverse + list(bases)#
lst = names.keys()
lst = list(names.keys())
types = []
for x in lst:
t = uno.getTypeByName( x )