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

21
pyuno/demo/biblioaccess.py
View File

@@ -1,35 +1,36 @@
import uno # -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
import uno
from com.sun.star.sdb.CommandType import COMMAND from com.sun.star.sdb.CommandType import COMMAND
def main(): def main():
connectionString = "socket,host=localhost,port=2002" connectionString = "socket,host=localhost,port=2002"
url = "uno:"+connectionString + ";urp;StarOffice.ComponentContext" url = "uno:" + connectionString + ";urp;StarOffice.ComponentContext"
localCtx = uno.getComponentContext() localCtx = uno.getComponentContext()
localSmgr = localCtx.ServiceManager localSmgr = localCtx.ServiceManager
resolver = localSmgr.createInstanceWithContext( resolver = localSmgr.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", localCtx) "com.sun.star.bridge.UnoUrlResolver", localCtx)
ctx = resolver.resolve( url ) ctx = resolver.resolve(url)
smgr = ctx.ServiceManager smgr = ctx.ServiceManager
rowset =smgr.createInstanceWithContext( "com.sun.star.sdb.RowSet", ctx ) rowset =smgr.createInstanceWithContext("com.sun.star.sdb.RowSet", ctx)
rowset.DataSourceName = "Bibliography" rowset.DataSourceName = "Bibliography"
rowset.CommandType = COMMAND rowset.CommandType = COMMAND
rowset.Command = "SELECT IDENTIFIER, AUTHOR FROM biblio" rowset.Command = "SELECT IDENTIFIER, AUTHOR FROM biblio"
rowset.execute(); rowset.execute();
print "Identifier\tAuthor" print("Identifier\tAuthor")
id = rowset.findColumn( "IDENTIFIER" ) id = rowset.findColumn("IDENTIFIER")
author = rowset.findColumn( "AUTHOR" ) author = rowset.findColumn("AUTHOR")
while rowset.next(): while rowset.next():
print rowset.getString( id ) + "\t" + repr( rowset.getString( author ) ) print(rowset.getString(id) + "\t" + repr(rowset.getString(author)))
rowset.dispose(); rowset.dispose();
main() main()
# vim:set shiftwidth=4 softtabstop=4 expandtab:

33
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 uno
import unohelper import unohelper
@@ -5,36 +7,37 @@ from com.sun.star.task import XJobExecutor
# implement a UNO component by deriving from the standard unohelper.Base class # implement a UNO component by deriving from the standard unohelper.Base class
# and from the interface(s) you want to implement. # and from the interface(s) you want to implement.
class HelloWorldJob( unohelper.Base, XJobExecutor ): class HelloWorldJob(unohelper.Base, XJobExecutor):
def __init__( self, ctx ): def __init__(self, ctx):
# store the component context for later use # store the component context for later use
self.ctx = ctx self.ctx = ctx
def trigger( self, args ): def trigger(self, args):
# note: args[0] == "HelloWorld", see below config settings # note: args[0] == "HelloWorld", see below config settings
# retrieve the desktop object # retrieve the desktop object
desktop = self.ctx.ServiceManager.createInstanceWithContext( desktop = self.ctx.ServiceManager.createInstanceWithContext(
"com.sun.star.frame.Desktop", self.ctx ) "com.sun.star.frame.Desktop", self.ctx)
# get current document model # get current document model
model = desktop.getCurrentComponent() model = desktop.getCurrentComponent()
# access the document's text property # access the document's text property
text = model.Text text = model.Text
# create a cursor # create a cursor
cursor = text.createTextCursor() cursor = text.createTextCursor()
# insert the text into the document # insert the text into the document
text.insertString( cursor, "Hello World", 0 ) text.insertString(cursor, "Hello World", 0)
# pythonloader looks for a static g_ImplementationHelper variable # pythonloader looks for a static g_ImplementationHelper variable
g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper = unohelper.ImplementationHelper()
#
g_ImplementationHelper.addImplementation( \ g_ImplementationHelper.addImplementation( \
HelloWorldJob, # UNO object class HelloWorldJob, # UNO object class
"org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name "org.openoffice.comp.pyuno.demo.HelloWorld", # implemenation name
("com.sun.star.task.Job",),) # list of implemented services ("com.sun.star.task.Job",),) # list of implemented services
# (the only service) # (the only service)
# vim:set shiftwidth=4 softtabstop=4 expandtab:

24
pyuno/demo/makefile.mk
View File

@@ -6,23 +6,21 @@ PRJ=..
ROOT=$(MISC)$/pyuno-doc ROOT=$(MISC)$/pyuno-doc
FILES=\ FILES=\
$(ROOT)$/python-bridge.html \ $(ROOT)$/python-bridge.html \
$(ROOT)$/customized_setup.png \ $(ROOT)$/customized_setup.png \
$(ROOT)$/mode_component.png \ $(ROOT)$/mode_component.png \
$(ROOT)$/mode_ipc.png \ $(ROOT)$/mode_ipc.png \
$(ROOT)$/modes.sxd \ $(ROOT)$/modes.sxd \
$(ROOT)$/optional_components.png \ $(ROOT)$/optional_components.png \
$(ROOT)$/samples$/swriter.py \ $(ROOT)$/samples$/swriter.py \
$(ROOT)$/samples$/swritercomp.py \ $(ROOT)$/samples$/swritercomp.py \
$(ROOT)$/samples$/ooextract.py \ $(ROOT)$/samples$/ooextract.py \
$(ROOT)$/samples$/biblioaccess.py \ $(ROOT)$/samples$/biblioaccess.py \
$(ROOT)$/samples$/swritercompclient.py \ $(ROOT)$/samples$/swritercompclient.py \
$(ROOT)$/samples$/hello_world_pyuno.zip $(ROOT)$/samples$/hello_world_pyuno.zip
$(MISC)$/pyuno-doc.zip : dirs $(FILES) $(MISC)$/pyuno-doc.zip : dirs $(FILES)
-rm -f $@ -rm -f $@
cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc cd $(MISC) && zip -r pyuno-doc.zip pyuno-doc

71
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 getopt,sys
import uno import uno
from unohelper import Base,systemPathToFileUrl, absolutize from unohelper import Base,systemPathToFileUrl, absolutize
@@ -8,26 +10,25 @@ from com.sun.star.beans.PropertyState import DIRECT_VALUE
from com.sun.star.uno import Exception as UnoException from com.sun.star.uno import Exception as UnoException
from com.sun.star.io import IOException,XInputStream, XOutputStream from com.sun.star.io import IOException,XInputStream, XOutputStream
class OutputStream( Base, XOutputStream ): class OutputStream(Base, XOutputStream):
def __init__( self ): def __init__(self):
self.closed = 0 self.closed = 0
def closeOutput(self): def closeOutput(self):
self.closed = 1 self.closed = 1
def writeBytes( self, seq ): def writeBytes(self, seq):
sys.stdout.write( seq.value ) sys.stdout.write(seq.value)
def flush( self ):
pass
def flush(self):
pass
def main(): def main():
retVal = 0 retVal = 0
doc = None doc = None
try: try:
opts, args = getopt.getopt(sys.argv[1:], "hc:",["help", "connection-string=" , "html"]) opts, args = getopt.getopt(sys.argv[1:], "hc:", ["help", "connection-string=", "html"])
format = None format = None
url = "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" url = "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext"
filterName = "Text (Encoded)" filterName = "Text (Encoded)"
@@ -35,13 +36,13 @@ def main():
if o in ("-h", "--help"): if o in ("-h", "--help"):
usage() usage()
sys.exit() sys.exit()
if o in ("-c", "--connection-string" ): if o in ("-c", "--connection-string"):
url = "uno:" + a + ";urp;StarOffice.ComponentContext" url = "uno:" + a + ";urp;StarOffice.ComponentContext"
if o == "--html": if o == "--html":
filterName = "HTML (StarWriter)" filterName = "HTML (StarWriter)"
print filterName print(filterName)
if not len( args ): if not len(args):
usage() usage()
sys.exit() sys.exit()
@@ -49,47 +50,47 @@ def main():
smgrLocal = ctxLocal.ServiceManager smgrLocal = ctxLocal.ServiceManager
resolver = smgrLocal.createInstanceWithContext( resolver = smgrLocal.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", ctxLocal ) "com.sun.star.bridge.UnoUrlResolver", ctxLocal)
ctx = resolver.resolve( url ) ctx = resolver.resolve(url)
smgr = ctx.ServiceManager smgr = ctx.ServiceManager
desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx ) desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", ctx)
cwd = systemPathToFileUrl( getcwd() ) cwd = systemPathToFileUrl(getcwd())
outProps = ( outProps = (
PropertyValue( "FilterName" , 0, filterName , 0 ), PropertyValue("FilterName" , 0, filterName, 0),
PropertyValue( "OutputStream",0, OutputStream(),0)) PropertyValue("OutputStream", 0, OutputStream(), 0))
inProps = PropertyValue( "Hidden" , 0 , True, 0 ), inProps = PropertyValue("Hidden", 0 , True, 0),
for path in args: for path in args:
try: try:
fileUrl = uno.absolutize( cwd, systemPathToFileUrl(path) ) fileUrl = uno.absolutize(cwd, systemPathToFileUrl(path))
doc = desktop.loadComponentFromURL( fileUrl , "_blank", 0,inProps) doc = desktop.loadComponentFromURL(fileUrl , "_blank", 0, inProps)
if not doc: 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) doc.storeToURL("private:stream", outProps)
except IOException, e: except IOException as e:
sys.stderr.write( "Error during conversion: " + e.Message + "\n" ) sys.stderr.write("Error during conversion: " + e.Message + "\n")
retVal = 1 retVal = 1
except UnoException, e: except UnoException as e:
sys.stderr.write( "Error ("+repr(e.__class__)+") during conversion:" + e.Message + "\n" ) sys.stderr.write("Error (" + repr(e.__class__) + ") during conversion: " + e.Message + "\n")
retVal = 1 retVal = 1
if doc: if doc:
doc.dispose() doc.dispose()
except UnoException, e: except UnoException as e:
sys.stderr.write( "Error ("+repr(e.__class__)+") :" + e.Message + "\n" ) sys.stderr.write("Error (" + repr(e.__class__) + "): " + e.Message + "\n")
retVal = 1 retVal = 1
except getopt.GetoptError,e: except getopt.GetoptError as e:
sys.stderr.write( str(e) + "\n" ) sys.stderr.write(str(e) + "\n")
usage() usage()
retVal = 1 retVal = 1
sys.exit(retVal) sys.exit(retVal)
def usage(): def usage():
sys.stderr.write( "usage: ooextract.py --help |\n"+ sys.stderr.write("usage: ooextract.py --help |\n"+
" [-c <connection-string> | --connection-string=<connection-string>\n"+ " [-c <connection-string> | --connection-string=<connection-string>\n"+
" file1 file2 ...\n"+ " file1 file2 ...\n"+
"\n" + "\n" +
@@ -107,3 +108,5 @@ def usage():
) )
main() main()
# vim:set shiftwidth=4 softtabstop=4 expandtab:

6
pyuno/demo/pyunoenv.tcsh
View File

@@ -18,9 +18,9 @@ setenv LD_LIBRARY_PATH
endif endif
if( "$PYTHONPATH" != "" ) then if( "$PYTHONPATH" != "" ) then
setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
else else
setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib setenv PYTHONPATH $OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
endif endif
setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
@@ -28,3 +28,5 @@ setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
if( $?PYTHONHOME ) then if( $?PYTHONHOME ) then
setenv PATH $PYTHONHOME/bin:$PATH setenv PATH $PYTHONHOME/bin:$PATH
endif endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:

21
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 # bootstrap uno component context
import uno import uno
import unohelper import unohelper
from com.sun.star.lang import IllegalArgumentException
# a UNO struct later needed to create a document # a UNO struct later needed to create a document
from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK from com.sun.star.text.ControlCharacter import PARAGRAPH_BREAK
@@ -19,7 +21,7 @@ def insertTextIntoCell( table, cellName, text, color ):
localContext = uno.getComponentContext() localContext = uno.getComponentContext()
resolver = localContext.ServiceManager.createInstanceWithContext( resolver = localContext.ServiceManager.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", localContext ) "com.sun.star.bridge.UnoUrlResolver", localContext )
smgr = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ServiceManager" ) smgr = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ServiceManager" )
remoteContext = smgr.getPropertyValue( "DefaultContext" ) remoteContext = smgr.getPropertyValue( "DefaultContext" )
@@ -41,15 +43,15 @@ text.insertString( cursor, "Now we are in the second line\n" , 0 )
table = doc.createInstance( "com.sun.star.text.TextTable" ) table = doc.createInstance( "com.sun.star.text.TextTable" )
# with 4 rows and 4 columns # with 4 rows and 4 columns
table.initialize( 4,4) table.initialize(4, 4)
text.insertTextContent( cursor, table, 0 ) text.insertTextContent( cursor, table, 0 )
rows = table.Rows rows = table.Rows
table.setPropertyValue( "BackTransparent", uno.Bool(0) ) table.setPropertyValue( "BackTransparent", False )
table.setPropertyValue( "BackColor", 13421823 ) table.setPropertyValue( "BackColor", 13421823 )
row = rows.getByIndex(0) row = rows.getByIndex(0)
row.setPropertyValue( "BackTransparent", uno.Bool(0) ) row.setPropertyValue( "BackTransparent", False )
row.setPropertyValue( "BackColor", 6710932 ) row.setPropertyValue( "BackColor", 6710932 )
textColor = 16777215 textColor = 16777215
@@ -60,8 +62,8 @@ insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
insertTextIntoCell( table, "D1", "SUM", textColor ) insertTextIntoCell( table, "D1", "SUM", textColor )
values = ( (22.5,21.5,121.5), values = ( (22.5,21.5,121.5),
(5615.3,615.3,-615.3), (5615.3,615.3,-615.3),
(-2315.7,315.7,415.7) ) (-2315.7,315.7,415.7) )
table.getCellByName("A2").setValue(22.5) table.getCellByName("A2").setValue(22.5)
table.getCellByName("B2").setValue(5615.3) table.getCellByName("B2").setValue(5615.3)
table.getCellByName("C2").setValue(-2315.7) table.getCellByName("C2").setValue(-2315.7)
@@ -79,7 +81,7 @@ table.getCellByName("D4").setFormula("sum <A4:C4>")
cursor.setPropertyValue( "CharColor", 255 ) cursor.setPropertyValue( "CharColor", 255 )
cursor.setPropertyValue( "CharShadowed", uno.Bool(1) ) cursor.setPropertyValue( "CharShadowed", True )
text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 ) text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 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 ) text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
cursor.setPropertyValue( "CharColor", 65536 ) 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:

132
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, # 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. # that the component may run within the office process which may give a performance improvement.
@@ -21,92 +23,92 @@ def insertTextIntoCell( table, cellName, text, color ):
# implementing the interface com.sun.star.lang.XMain # implementing the interface com.sun.star.lang.XMain
# unohelper.Base implements the XTypeProvider interface # unohelper.Base implements the XTypeProvider interface
class SWriterComp(XMain,unohelper.Base): class SWriterComp(XMain,unohelper.Base):
def __init__( self, ctx ): def __init__( self, ctx ):
self.ctx = ctx self.ctx = ctx
# implementation for XMain.run( [in] sequence< any > ) # implementation for XMain.run( [in] sequence< any > )
def run( self,args ): def run( self,args ):
ctx = self.ctx
smgr = ctx.ServiceManager
desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
ctx = self.ctx # open a writer document
smgr = ctx.ServiceManager doc = desktop.loadComponentFromURL( "private:factory/swriter","_blank", 0, () )
desktop = smgr.createInstanceWithContext( "com.sun.star.frame.Desktop",ctx)
# open a writer document text = doc.Text
doc = desktop.loadComponentFromURL( "private:factory/swriter","_blank", 0, () ) cursor = text.createTextCursor()
text.insertString( cursor, "The first line in the newly created text document.\n", 0 )
text.insertString( cursor, "Now we are in the second line\n" , 0 )
text = doc.Text # create a text table
cursor = text.createTextCursor() table = doc.createInstance( "com.sun.star.text.TextTable" )
text.insertString( cursor, "The first line in the newly created text document.\n", 0 )
text.insertString( cursor, "Now we are in the second line\n" , 0 )
# create a text table # with 4 rows and 4 columns
table = doc.createInstance( "com.sun.star.text.TextTable" ) table.initialize( 4,4)
# with 4 rows and 4 columns text.insertTextContent( cursor, table, 0 )
table.initialize( 4,4) rows = table.Rows
text.insertTextContent( cursor, table, 0 ) table.setPropertyValue( "BackTransparent", uno.Bool(0) )
rows = table.Rows table.setPropertyValue( "BackColor", 13421823 )
row = rows.getByIndex(0)
row.setPropertyValue( "BackTransparent", uno.Bool(0) )
row.setPropertyValue( "BackColor", 6710932 )
table.setPropertyValue( "BackTransparent", uno.Bool(0) ) textColor = 16777215
table.setPropertyValue( "BackColor", 13421823 )
row = rows.getByIndex(0)
row.setPropertyValue( "BackTransparent", uno.Bool(0) )
row.setPropertyValue( "BackColor", 6710932 )
textColor = 16777215 insertTextIntoCell( table, "A1", "FirstColumn", textColor )
insertTextIntoCell( table, "B1", "SecondColumn", textColor )
insertTextIntoCell( table, "C1", "ThirdColumn", textColor )
insertTextIntoCell( table, "D1", "SUM", textColor )
insertTextIntoCell( table, "A1", "FirstColumn", textColor ) values = ( (22.5,21.5,121.5),
insertTextIntoCell( table, "B1", "SecondColumn", textColor ) (5615.3,615.3,-615.3),
insertTextIntoCell( table, "C1", "ThirdColumn", textColor ) (-2315.7,315.7,415.7) )
insertTextIntoCell( table, "D1", "SUM", textColor ) table.getCellByName("A2").setValue(22.5)
table.getCellByName("B2").setValue(5615.3)
table.getCellByName("C2").setValue(-2315.7)
table.getCellByName("D2").setFormula("sum <A2:C2>")
values = ( (22.5,21.5,121.5), table.getCellByName("A3").setValue(21.5)
(5615.3,615.3,-615.3), table.getCellByName("B3").setValue(615.3)
(-2315.7,315.7,415.7) ) table.getCellByName("C3").setValue(-315.7)
table.getCellByName("A2").setValue(22.5) table.getCellByName("D3").setFormula("sum <A3:C3>")
table.getCellByName("B2").setValue(5615.3)
table.getCellByName("C2").setValue(-2315.7)
table.getCellByName("D2").setFormula("sum <A2:C2>")
table.getCellByName("A3").setValue(21.5) table.getCellByName("A4").setValue(121.5)
table.getCellByName("B3").setValue(615.3) table.getCellByName("B4").setValue(-615.3)
table.getCellByName("C3").setValue(-315.7) table.getCellByName("C4").setValue(415.7)
table.getCellByName("D3").setFormula("sum <A3:C3>") table.getCellByName("D4").setFormula("sum <A4:C4>")
table.getCellByName("A4").setValue(121.5)
table.getCellByName("B4").setValue(-615.3)
table.getCellByName("C4").setValue(415.7)
table.getCellByName("D4").setFormula("sum <A4:C4>")
cursor.setPropertyValue( "CharColor", 255 ) cursor.setPropertyValue( "CharColor", 255 )
cursor.setPropertyValue( "CharShadowed", uno.Bool(1) ) cursor.setPropertyValue( "CharShadowed", uno.Bool(1) )
text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 ) text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 ) text.insertString( cursor, " This is a colored Text - blue with shadow\n" , 0 )
text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 ) text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
textFrame = doc.createInstance( "com.sun.star.text.TextFrame" ) textFrame = doc.createInstance( "com.sun.star.text.TextFrame" )
textFrame.setSize( Size(15000,400)) textFrame.setSize( Size(15000,400))
textFrame.setPropertyValue( "AnchorType" , AS_CHARACTER ) textFrame.setPropertyValue( "AnchorType" , AS_CHARACTER )
text.insertTextContent( cursor, textFrame, 0 ) text.insertTextContent( cursor, textFrame, 0 )
textInTextFrame = textFrame.getText() textInTextFrame = textFrame.getText()
cursorInTextFrame = textInTextFrame.createTextCursor() cursorInTextFrame = textInTextFrame.createTextCursor()
textInTextFrame.insertString( cursorInTextFrame, "The first line in the newly created text frame.", 0 ) textInTextFrame.insertString( cursorInTextFrame, "The first line in the newly created text frame.", 0 )
textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the height of the rame raises.",0) textInTextFrame.insertString( cursorInTextFrame, "\nWith this second line the height of the rame raises.",0)
text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 ) text.insertControlCharacter( cursor, PARAGRAPH_BREAK, 0 )
cursor.setPropertyValue( "CharColor", 65536 ) cursor.setPropertyValue( "CharColor", 65536 )
cursor.setPropertyValue( "CharShadowed", uno.Bool(0) ) cursor.setPropertyValue( "CharShadowed", uno.Bool(0) )
text.insertString( cursor, " That's all for now !!" , 0 )
return 0
text.insertString( cursor, " That's all for now!" , 0 )
return 0
# pythonloader looks for a static g_ImplementationHelper variable # pythonloader looks for a static g_ImplementationHelper variable
g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper = unohelper.ImplementationHelper()
g_ImplementationHelper.addImplementation( \ g_ImplementationHelper.addImplementation( \
SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),) SWriterComp,"org.openoffice.comp.pyuno.swriter",("org.openoffice.demo.SWriter",),)
# vim:set shiftwidth=4 softtabstop=4 expandtab:

6
pyuno/demo/swritercompclient.py
View File

@@ -1,9 +1,10 @@
# instantiating # -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
import uno import uno
localContext = uno.getComponentContext() localContext = uno.getComponentContext()
resolver = localContext.ServiceManager.createInstanceWithContext( resolver = localContext.ServiceManager.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", localContext ) "com.sun.star.bridge.UnoUrlResolver", localContext )
remoteContext = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" ) remoteContext = resolver.resolve( "uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext" )
remoteSmgr = remoteContext.ServiceManager remoteSmgr = remoteContext.ServiceManager
@@ -11,3 +12,4 @@ pyComp = remoteSmgr.createInstanceWithContext( "org.openoffice.demo.SWriter" , r
pyComp.run( (), ) 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 preconditions: python has been initialized before and
the global interpreter lock is held 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 namespace pyuno
{ {

10
pyuno/prj/build.lst
View File

@@ -1,5 +1,5 @@
bgpu pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL bgpu pyuno : stoc cpputools cppuhelper bridges tools PYTHON:python LIBXSLT:libxslt NULL
pu pyuno usr1 - all br_mkout NULL pu pyuno usr1 - all br_mkout NULL
pu pyuno\zipcore nmake - all pu_zipcore NULL pu pyuno\zipcore nmake - all pu_zipcore NULL
pu pyuno\source\module nmake - all pu_module NULL pu pyuno\source\module nmake - all pu_module NULL
pu pyuno\source\loader nmake - all pu_loader pu_module NULL pu pyuno\source\loader nmake - all pu_loader pu_module NULL

32
pyuno/source/loader/makefile.mk
View File

@@ -32,7 +32,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(L10N_framework)"=="" .IF "$(L10N_framework)"==""
DLLPRE = DLLPRE =
@@ -40,38 +40,38 @@ DLLPRE =
.IF "$(OS)$(COMEX)" == "SOLARIS4" .IF "$(OS)$(COMEX)" == "SOLARIS4"
# no -Bdirect for SunWS CC # no -Bdirect for SunWS CC
DIRECT = $(LINKFLAGSDEFS) DIRECT= $(LINKFLAGSDEFS)
.ENDIF .ENDIF
.IF "$(SYSTEM_PYTHON)" == "YES" .IF "$(SYSTEM_PYTHON)" == "YES"
PYTHONLIB=$(PYTHON_LIBS) PYTHONLIB=$(PYTHON_LIBS)
CFLAGS+=$(PYTHON_CFLAGS) CFLAGS+=$(PYTHON_CFLAGS)
.IF "$(EXTRA_CFLAGS)"!="" .IF "$(EXTRA_CFLAGS)"!=""
PYTHONLIB+=-framework Python PYTHONLIB+= -framework Python
.ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(EXTRA_CFLAGS)"!=""
.ELSE .ELSE
.INCLUDE : pyversion.mk .INCLUDE : pyversion.mk
CFLAGS+=-I$(SOLARINCDIR)$/python CFLAGS+= -I$(SOLARINCDIR)$/python
.ENDIF .ENDIF
SHL1TARGET= $(TARGET) SHL1TARGET= $(TARGET)
SHL1STDLIBS= \ SHL1STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(SALLIB) \ $(SALLIB) \
$(PYUNOLIB) \ $(PYUNOLIB) \
$(PYTHONLIB) $(PYTHONLIB)
SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map
SHL1DEPN= SHL1DEPN=
SHL1IMPLIB= i$(TARGET) SHL1IMPLIB= i$(TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET) DEF1NAME= $(SHL1TARGET)
SLOFILES= $(SLO)$/pyuno_loader.obj SLOFILES= $(SLO)$/pyuno_loader.obj
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------

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

@@ -40,112 +40,110 @@ g_supportedServices = "com.sun.star.loader.Python", # referenced by the na
g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader ! g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader !
def splitUrl( url ): def splitUrl( url ):
nColon = url.find( ":" ) nColon = url.find( ":" )
if -1 == nColon: if -1 == nColon:
raise RuntimeException( "PythonLoader: No protocol in url " + url, None ) raise RuntimeException( "PythonLoader: No protocol in url " + url, None )
return url[0:nColon], url[nColon+1:len(url)] return url[0:nColon], url[nColon+1:len(url)]
g_loadedComponents = {} g_loadedComponents = {}
def checkForPythonPathBesideComponent( url ): def checkForPythonPathBesideComponent( url ):
path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" ); path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
if DEBUG == 1: 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 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
if DEBUG == 1: if DEBUG == 1:
print "adding " + encfile( path ) + " to sys.path" print("adding " + encfile( path ) + " to sys.path")
sys.path.append( path ) sys.path.append( path )
path = unohelper.fileUrlToSystemPath( url+"/pythonpath" ); path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path: if 1 == os.access( encfile( path ), os.F_OK) and not path in sys.path:
if DEBUG == 1: if DEBUG == 1:
print "adding " + encfile( path ) + " to sys.path" print("adding " + encfile( path ) + " to sys.path")
sys.path.append( path ) sys.path.append( path )
def encfile(uni): def encfile(uni):
return uni.encode( sys.getfilesystemencoding()) return uni.encode( sys.getfilesystemencoding())
class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ):
def __init__(self, ctx ): def __init__(self, ctx ):
if DEBUG: if DEBUG:
print "pythonloader.Loader ctor" print("pythonloader.Loader ctor")
self.ctx = ctx self.ctx = ctx
def getModuleFromUrl( self, url ): def getModuleFromUrl( self, url ):
if DEBUG: if DEBUG:
print "pythonloader: interpreting url " +url print("pythonloader: interpreting url " + url)
protocol, dependent = splitUrl( url ) protocol, dependent = splitUrl( url )
if "vnd.sun.star.expand" == protocol: if "vnd.sun.star.expand" == protocol:
exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" ) exp = self.ctx.getValueByName( "/singletons/com.sun.star.util.theMacroExpander" )
url = exp.expandMacros(dependent) url = exp.expandMacros(dependent)
protocol,dependent = splitUrl( url ) protocol,dependent = splitUrl( url )
if DEBUG: if DEBUG:
print "pythonloader: after expansion " +protocol +":" + dependent print("pythonloader: after expansion " + protocol + ":" + dependent)
try: try:
if "file" == protocol: if "file" == protocol:
# remove \..\ sequence, which may be useful e.g. in the build env # remove \..\ sequence, which may be useful e.g. in the build env
url = unohelper.absolutize( url, url ) url = unohelper.absolutize( url, url )
# did we load the module already ? # did we load the module already ?
mod = g_loadedComponents.get( url ) mod = g_loadedComponents.get( url )
if not mod: if not mod:
mod = imp.new_module("uno_component") mod = imp.new_module("uno_component")
# check for pythonpath.zip beside .py files # check for pythonpath.zip beside .py files
checkForPythonPathBesideComponent( url[0:url.rfind('/')] ) checkForPythonPathBesideComponent( url[0:url.rfind('/')] )
# read the file # read the file
filename = unohelper.fileUrlToSystemPath( url ) filename = unohelper.fileUrlToSystemPath( url )
fileHandle = file( filename ) fileHandle = file( filename )
src = fileHandle.read().replace("\r","") src = fileHandle.read().replace("\r","")
if not src.endswith( "\n" ): if not src.endswith( "\n" ):
src = src + "\n" src = src + "\n"
# compile and execute the module # compile and execute the module
codeobject = compile( src, encfile(filename), "exec" ) codeobject = compile( src, encfile(filename), "exec" )
exec codeobject in mod.__dict__ exec(codeobject, mod.__dict__)
mod.__file__ = encfile(filename) mod.__file__ = encfile(filename)
g_loadedComponents[url] = mod g_loadedComponents[url] = mod
return mod return mod
elif "vnd.openoffice.pymodule" == protocol: elif "vnd.openoffice.pymodule" == protocol:
return __import__( dependent ) return __import__( dependent )
else: else:
raise RuntimeException( "PythonLoader: Unknown protocol " + raise RuntimeException( "PythonLoader: Unknown protocol " +
protocol + " in url " +url, self ) protocol + " in url " +url, self )
except ImportError, e: except ImportError as e:
raise RuntimeException( "Couldn't load "+url+ " for reason "+str(e), None) raise RuntimeException( "Couldn't load " + url + " for reason " + str(e), None )
return None return None
def activate( self, implementationName, dummy, locationUrl, regKey ): def activate( self, implementationName, dummy, locationUrl, regKey ):
if DEBUG: if DEBUG:
print "pythonloader.Loader.activate" print("pythonloader.Loader.activate")
mod = self.getModuleFromUrl( locationUrl ) mod = self.getModuleFromUrl( locationUrl )
implHelper = mod.__dict__.get( "g_ImplementationHelper" , None ) implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
if implHelper == None: if implHelper == None:
return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey ) return mod.getComponentFactory( implementationName, self.ctx.ServiceManager, regKey )
else: else:
return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager) return implHelper.getComponentFactory( implementationName,regKey,self.ctx.ServiceManager)
def writeRegistryInfo( self, regKey, dummy, locationUrl ): def writeRegistryInfo( self, regKey, dummy, locationUrl ):
if DEBUG: if DEBUG:
print "pythonloader.Loader.writeRegistryInfo" print( "pythonloader.Loader.writeRegistryInfo" )
mod = self.getModuleFromUrl( locationUrl ) mod = self.getModuleFromUrl( locationUrl )
implHelper = mod.__dict__.get( "g_ImplementationHelper" , None ) implHelper = mod.__dict__.get( "g_ImplementationHelper" , None )
if implHelper == None: if implHelper == None:
return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey ) return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )
else: else:
return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager ) return implHelper.writeRegistryInfo( regKey, self.ctx.ServiceManager )
def getImplementationName( self ): def getImplementationName( self ):
return g_implementationName return g_implementationName
def supportsService( self, ServiceName ):
return ServiceName in self.serviceNames
def getSupportedServiceNames( self ):
return g_supportedServices
def supportsService( self, ServiceName ):
return ServiceName in self.serviceNames
def getSupportedServiceNames( self ):
return g_supportedServices

30
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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,8 +118,26 @@ static void setPythonHome ( const OUString & pythonHome )
OUString systemPythonHome; OUString systemPythonHome;
osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) ); osl_getSystemPathFromFileURL( pythonHome.pData, &(systemPythonHome.pData) );
OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() ); OString o = rtl::OUStringToOString( systemPythonHome, osl_getThreadTextEncoding() );
rtl_string_acquire(o.pData); // leak this string (thats the api!) #if PY_MAJOR_VERSION >= 3
Py_SetPythonHome( o.pData->buffer); // 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 ) static void prependPythonPath( const OUString & pythonPathBootstrap )
@@ -178,7 +196,11 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
if( pythonPath.getLength() ) if( pythonPath.getLength() )
prependPythonPath( pythonPath ); prependPythonPath( pythonPath );
#if PY_MAJOR_VERSION >= 3
PyImport_AppendInittab( "pyuno", PyInit_pyuno );
#else
PyImport_AppendInittab( "pyuno", initpyuno );
#endif
// initialize python // initialize python
Py_Initialize(); Py_Initialize();
PyEval_InitThreads(); PyEval_InitThreads();

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

@@ -36,6 +36,7 @@ LINKFLAGSDEFS = # do not fail with missing symbols
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(L10N_framework)"=="" .IF "$(L10N_framework)"==""
#------------------------------------------------------------------- #-------------------------------------------------------------------
.IF "$(OS)$(COMEX)" == "SOLARIS4" .IF "$(OS)$(COMEX)" == "SOLARIS4"
@@ -49,9 +50,6 @@ EXTRA_FRAMEWORK_FLAG=-framework Python
.ENDIF # .IF "$(EXTRA_CFLAGS)"!="" .ENDIF # .IF "$(EXTRA_CFLAGS)"!=""
.IF "$(GUI)" == "UNX" .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 PYUNORC=pyunorc
.ELSE .ELSE
.INCLUDE : pyversion.mk .INCLUDE : pyversion.mk
@@ -69,38 +67,37 @@ CFLAGS+=-I$(SOLARINCDIR)$/python
SHL1TARGET=$(TARGET) SHL1TARGET=$(TARGET)
SLOFILES= \ SLOFILES= \
$(SLO)$/pyuno_runtime.obj \ $(SLO)$/pyuno_runtime.obj \
$(SLO)$/pyuno.obj \ $(SLO)$/pyuno.obj \
$(SLO)$/pyuno_callable.obj \ $(SLO)$/pyuno_callable.obj \
$(SLO)$/pyuno_module.obj \ $(SLO)$/pyuno_module.obj \
$(SLO)$/pyuno_type.obj \ $(SLO)$/pyuno_type.obj \
$(SLO)$/pyuno_util.obj \ $(SLO)$/pyuno_util.obj \
$(SLO)$/pyuno_except.obj \ $(SLO)$/pyuno_except.obj \
$(SLO)$/pyuno_adapter.obj \ $(SLO)$/pyuno_adapter.obj \
$(SLO)$/pyuno_gc.obj $(SLO)$/pyuno_gc.obj
# remove this, when issue i35064 is integrated # remove this, when issue i35064 is integrated
.IF "$(COM)"=="GCC" .IF "$(COM)"=="GCC"
NOOPTFILES= \ NOOPTFILES= \
$(SLO)$/pyuno_module.obj $(SLO)$/pyuno_module.obj
.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(COM)"=="GCC"
SHL1STDLIBS= \ SHL1STDLIBS= \
$(CPPULIB) \ $(CPPULIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(SALLIB) \ $(SALLIB) \
$(PYTHONLIB) \ $(PYTHONLIB) \
$(EXTRA_FRAMEWORK_FLAG) $(EXTRA_FRAMEWORK_FLAG)
SHL1DEPN= SHL1DEPN=
SHL1LIBS=$(SLB)$/$(TARGET).lib SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1IMPLIB=i$(TARGET) SHL1IMPLIB= i$(TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET) DEF1NAME= $(SHL1TARGET)
DEF1DEPN= $(MISC)$/pyuno.flt DEF1DEPN= $(MISC)$/pyuno.flt
DEFLIB1NAME=$(TARGET) DEFLIB1NAME=$(TARGET)
@@ -108,20 +105,19 @@ DEFLIB1NAME=$(TARGET)
.IF "$(GUI)$(COM)"=="WNTGCC" .IF "$(GUI)$(COM)"=="WNTGCC"
ALLTAR : \ ALLTAR : \
$(DLLDEST)$/uno.py \ $(DLLDEST)$/uno.py \
$(DLLDEST)$/unohelper.py \ $(DLLDEST)$/unohelper.py \
$(PYUNO_MODULE) \ $(MISC)$/$(PYUNORC) \
$(MISC)$/$(PYUNORC) \
$(LB)$/lib$(TARGET).a $(LB)$/lib$(TARGET).a
$(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def $(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def
dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a
.ELSE .ELSE
ALLTAR : \ ALLTAR : \
$(DLLDEST)$/uno.py \ $(DLLDEST)$/uno.py \
$(DLLDEST)$/unohelper.py \ $(DLLDEST)$/unohelper.py \
$(PYUNO_MODULE) \ $(MISC)$/$(PYUNORC) \
$(MISC)$/$(PYUNORC) $(LB)$/$(TARGET)$(DLLPOST)
.ENDIF .ENDIF
.ENDIF .ENDIF
@@ -130,31 +126,6 @@ ALLTAR : \
$(DLLDEST)$/%.py: %.py $(DLLDEST)$/%.py: %.py
cp $? $@ 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 $(MISC)$/$(PYUNORC) : pyuno
-rm -f $@ -rm -f $@
cat pyuno > $@ cat pyuno > $@
@@ -162,5 +133,12 @@ $(MISC)$/$(PYUNORC) : pyuno
$(MISC)$/pyuno.flt : pyuno.flt $(MISC)$/pyuno.flt : pyuno.flt
-rm -f $@ -rm -f $@
cat $? > $@ 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 .ENDIF # L10N_framework
# vim:set shiftwidth=4 softtabstop=4 expandtab:

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

@@ -135,13 +135,6 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
} }
case typelib_TypeClass_UNION: 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; break;
} }
case typelib_TypeClass_STRUCT: case typelib_TypeClass_STRUCT:
@@ -193,7 +186,7 @@ OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef
TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType ); TYPELIB_DANGER_GET( &pElementTypeDescr, ((typelib_IndirectTypeDescription *)pTypeDescr)->pType );
sal_Int32 nElementSize = pElementTypeDescr->nSize; sal_Int32 nElementSize = pElementTypeDescr->nSize;
sal_Int32 nElements = pSequence->nElements; sal_Int32 nElements = pSequence->nElements;
if (nElements) if (nElements)
{ {
@@ -600,11 +593,17 @@ int PyUNO_setattr (PyObject* self, char* name, PyObject* value)
} }
// ensure object identity and struct equality // 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; return 0;
int retDefault = self > that ? 1 : -1; }
if( self == that )
{
return (op == Py_EQ ? Py_True : Py_False);
}
try try
{ {
Runtime runtime; Runtime runtime;
@@ -624,13 +623,16 @@ static int PyUNO_cmp( PyObject *self, PyObject *that )
Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY); Reference< XMaterialHolder > xMe( me->members->xInvocation,UNO_QUERY);
Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY ); Reference< XMaterialHolder > xOther( other->members->xInvocation,UNO_QUERY );
if( xMe->getMaterial() == xOther->getMaterial() ) if( xMe->getMaterial() == xOther->getMaterial() )
return 0; {
return (op == Py_EQ ? Py_True : Py_False);
}
} }
else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE ) else if( tcMe == com::sun::star::uno::TypeClass_INTERFACE )
{ {
if( me->members->wrappedObject == other->members->wrappedObject ) 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 ) ); raisePyExceptionWithAny( makeAny( e ) );
} }
return retDefault; return Py_False;
} }
static PyTypeObject PyUNOType = static PyTypeObject PyUNOType =
{ {
PyObject_HEAD_INIT (&PyType_Type) PyVarObject_HEAD_INIT( &PyType_Type, 0 )
0,
const_cast< char * >("pyuno"), const_cast< char * >("pyuno"),
sizeof (PyUNO), sizeof (PyUNO),
0, 0,
@@ -653,7 +654,7 @@ static PyTypeObject PyUNOType =
(printfunc) 0, (printfunc) 0,
(getattrfunc) PyUNO_getattr, (getattrfunc) PyUNO_getattr,
(setattrfunc) PyUNO_setattr, (setattrfunc) PyUNO_setattr,
(cmpfunc) PyUNO_cmp, 0,
(reprfunc) PyUNO_repr, (reprfunc) PyUNO_repr,
0, 0,
0, 0,
@@ -668,7 +669,7 @@ static PyTypeObject PyUNOType =
NULL, NULL,
(traverseproc)0, (traverseproc)0,
(inquiry)0, (inquiry)0,
(richcmpfunc)0, (richcmpfunc) PyUNO_cmp,
0, 0,
(getiterfunc)0, (getiterfunc)0,
(iternextfunc)0, (iternextfunc)0,

7
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 = static PyTypeObject PyUNO_callable_Type =
{ {
PyObject_HEAD_INIT (&PyType_Type) PyVarObject_HEAD_INIT( &PyType_Type, 0 )
0,
const_cast< char * >("PyUNO_callable"), const_cast< char * >("PyUNO_callable"),
sizeof (PyUNO_callable), sizeof (PyUNO_callable),
0, 0,
@@ -205,7 +204,7 @@ static PyTypeObject PyUNO_callable_Type =
(printfunc) 0, (printfunc) 0,
(getattrfunc) 0, (getattrfunc) 0,
(setattrfunc) 0, (setattrfunc) 0,
(cmpfunc) 0, 0,
(reprfunc) 0, (reprfunc) 0,
0, 0,
0, 0,
@@ -213,7 +212,7 @@ static PyTypeObject PyUNO_callable_Type =
(hashfunc) 0, (hashfunc) 0,
(ternaryfunc) ::pyuno::PyUNO_callable_call, (ternaryfunc) ::pyuno::PyUNO_callable_call,
(reprfunc) 0, (reprfunc) 0,
(getattrofunc)0, (getattrofunc)0,
(setattrofunc)0, (setattrofunc)0,
NULL, NULL,
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() ); PyTuple_SetItem( args.get(), 2, PyDict_New() );
PyRef ret( PyRef ret(
PyObject_CallObject(reinterpret_cast<PyObject *>(&PyClass_Type) , args.get()), PyObject_CallObject(reinterpret_cast<PyObject *>(&PyType_Type) , args.get()),
SAL_NO_ACQUIRE ); SAL_NO_ACQUIRE );
// now overwrite ctor and attrib functions // now overwrite ctor and attrib functions

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

@@ -28,6 +28,8 @@
#ifndef _PYUNO_IMPL_ #ifndef _PYUNO_IMPL_
#define _PYUNO_IMPL_ #define _PYUNO_IMPL_
#include <Python.h>
#include <pyuno/pyuno.hxx> #include <pyuno/pyuno.hxx>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
@@ -48,6 +50,49 @@
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weakref.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 namespace pyuno
{ {
@@ -142,9 +187,6 @@ com::sun::star::uno::Any PyObjectToAny (PyObject* o)
void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime ) void raiseInvocationTargetExceptionWhenNeeded( const Runtime &runtime )
throw ( com::sun::star::reflection::InvocationTargetException ); 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); com::sun::star::uno::TypeClass StringToTypeClass (char* string);
PyRef PyUNO_callable_new ( PyRef PyUNO_callable_new (

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

@@ -230,7 +230,7 @@ PyObject * extractOneStringArg( PyObject *args, char const *funcName )
return NULL; return NULL;
} }
PyObject *obj = PyTuple_GetItem( args, 0 ); PyObject *obj = PyTuple_GetItem( args, 0 );
if( !PyString_Check( obj ) && ! PyUnicode_Check(obj)) if(!PyString_Check(obj) && !PyUnicode_Check(obj))
{ {
OStringBuffer buf; OStringBuffer buf;
buf.append( funcName ).append( ": expecting one string argument" ); buf.append( funcName ).append( ": expecting one string argument" );
@@ -244,16 +244,17 @@ static PyObject *createUnoStructHelper(PyObject *, PyObject* args )
{ {
Any IdlStruct; Any IdlStruct;
PyRef ret; PyRef ret;
try try
{ {
Runtime runtime; Runtime runtime;
if( PyTuple_Size( args ) == 2 ) if( PyTuple_Size( args ) == 2 )
{ {
PyObject *structName = PyTuple_GetItem( args,0 ); PyObject *structName = PyTuple_GetItem(args, 0);
PyObject *initializer = PyTuple_GetItem( args ,1 ); 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 ) ) if( PyTuple_Check( initializer ) )
{ {
@@ -491,9 +492,9 @@ static PyObject *isInterface( PyObject *, PyObject *args )
{ {
PyObject *obj = PyTuple_GetItem( args, 0 ); PyObject *obj = PyTuple_GetItem( args, 0 );
Runtime r; 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 * ) static PyObject * generateUuid( PyObject *, PyObject * )
@@ -592,41 +593,42 @@ static PyObject * absolutize( PyObject *, PyObject * args )
return 0; return 0;
} }
static PyObject * invoke ( PyObject *, PyObject * args ) static PyObject * invoke(PyObject *, PyObject *args)
{ {
PyObject *ret = 0; PyObject *ret = 0;
if( PyTuple_Check( args ) && PyTuple_Size( args ) == 3 ) if(PyTuple_Check(args) && PyTuple_Size(args) == 3)
{ {
PyObject *object = PyTuple_GetItem( args, 0 ); PyObject *object = PyTuple_GetItem(args, 0);
PyObject *item1 = PyTuple_GetItem(args, 1);
if( PyString_Check( PyTuple_GetItem( args, 1 ) ) ) if(PyString_Check(item1) || PyUnicode_Check(item1))
{ {
const char *name = PyString_AsString( PyTuple_GetItem( args, 1 ) ); const char *name = PyString_AsString(item1);
if( PyTuple_Check( PyTuple_GetItem( args , 2 ))) 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 else
{ {
OStringBuffer buf; OStringBuffer buf;
buf.append( "uno.invoke expects a tuple as 3rd argument, got " ); 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() ); PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
} }
} }
else else
{ {
OStringBuffer buf; OStringBuffer buf;
buf.append( "uno.invoke expected a string as 2nd argument, got " ); 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() ); PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
} }
} }
else else
{ {
OStringBuffer buf; OStringBuffer buf;
buf.append( "uno.invoke expects object, name, (arg1, arg2, ... )\n" ); buf.append("uno.invoke expects object, name, (arg1, arg2, ... )\n");
PyErr_SetString( PyExc_RuntimeError, buf.makeStringAndClear() ); PyErr_SetString(PyExc_RuntimeError, buf.makeStringAndClear());
} }
return ret; return ret;
} }
@@ -690,31 +692,52 @@ static PyObject *setCurrentContext( PyObject *, PyObject * args )
struct PyMethodDef PyUNOModule_methods [] = struct PyMethodDef PyUNOModule_methods [] =
{ {
{const_cast< char * >("getComponentContext"), getComponentContext, 1, NULL}, {const_cast< char * >("getComponentContext"), getComponentContext, METH_VARARGS, NULL},
{const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, 2, NULL}, {const_cast< char * >("_createUnoStructHelper"), createUnoStructHelper, METH_VARARGS | METH_KEYWORDS, NULL},
{const_cast< char * >("getTypeByName"), getTypeByName, 1, NULL}, {const_cast< char * >("getTypeByName"), getTypeByName, METH_VARARGS, NULL},
{const_cast< char * >("getConstantByName"), getConstantByName,1, NULL}, {const_cast< char * >("getConstantByName"), getConstantByName, METH_VARARGS, NULL},
{const_cast< char * >("getClass"), getClass,1, NULL}, {const_cast< char * >("getClass"), getClass, METH_VARARGS, NULL},
{const_cast< char * >("checkEnum"), checkEnum, 1, NULL}, {const_cast< char * >("checkEnum"), checkEnum, METH_VARARGS, NULL},
{const_cast< char * >("checkType"), checkType, 1, NULL}, {const_cast< char * >("checkType"), checkType, METH_VARARGS, NULL},
{const_cast< char * >("generateUuid"), generateUuid,0, NULL}, {const_cast< char * >("generateUuid"), generateUuid, METH_VARARGS, NULL},
{const_cast< char * >("systemPathToFileUrl"),systemPathToFileUrl,1, NULL}, {const_cast< char * >("systemPathToFileUrl"), systemPathToFileUrl, METH_VARARGS, NULL},
{const_cast< char * >("fileUrlToSystemPath"),fileUrlToSystemPath,1, NULL}, {const_cast< char * >("fileUrlToSystemPath"), fileUrlToSystemPath, METH_VARARGS, NULL},
{const_cast< char * >("absolutize"),absolutize,2, NULL}, {const_cast< char * >("absolutize"), absolutize, METH_VARARGS | METH_KEYWORDS, NULL},
{const_cast< char * >("isInterface"),isInterface,1, NULL}, {const_cast< char * >("isInterface"), isInterface, METH_VARARGS, NULL},
{const_cast< char * >("invoke"),invoke, 2, NULL}, {const_cast< char * >("invoke"), invoke, METH_VARARGS | METH_KEYWORDS, NULL},
{const_cast< char * >("setCurrentContext"),setCurrentContext,1, NULL}, {const_cast< char * >("setCurrentContext"), setCurrentContext, METH_VARARGS, NULL},
{const_cast< char * >("getCurrentContext"),getCurrentContext,1, NULL}, {const_cast< char * >("getCurrentContext"), getCurrentContext, METH_VARARGS, NULL},
{NULL, NULL, 0, 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 // 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(); PyEval_InitThreads();
Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods); Py_InitModule (const_cast< char * >("pyuno"), PyUNOModule_methods);
} }
#endif /* PY_MAJOR_VERSION >= 3 */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

@@ -72,8 +72,7 @@ namespace pyuno
static PyTypeObject RuntimeImpl_Type = static PyTypeObject RuntimeImpl_Type =
{ {
PyObject_HEAD_INIT (&PyType_Type) PyVarObject_HEAD_INIT (&PyType_Type, 0)
0,
const_cast< char * >("pyuno_runtime"), const_cast< char * >("pyuno_runtime"),
sizeof (RuntimeImpl), sizeof (RuntimeImpl),
0, 0,
@@ -81,7 +80,7 @@ static PyTypeObject RuntimeImpl_Type =
(printfunc) 0, (printfunc) 0,
(getattrfunc) 0, (getattrfunc) 0,
(setattrfunc) 0, (setattrfunc) 0,
(cmpfunc) 0, 0,
(reprfunc) 0, (reprfunc) 0,
0, 0,
0, 0,
@@ -445,7 +444,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
{ {
sal_Int32 l = 0; sal_Int32 l = 0;
a >>= l; a >>= l;
return PyRef( PyInt_FromLong (l), SAL_NO_ACQUIRE ); return PyRef( PyLong_FromLong (l), SAL_NO_ACQUIRE );
} }
case typelib_TypeClass_UNSIGNED_LONG: 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)) else if (PyInt_Check (o))
{ {
if( o == Py_True ) if( o == Py_True )
@@ -680,7 +681,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
} }
else else
{ {
sal_Int32 l = (sal_Int32) PyInt_AsLong( o ); sal_Int32 l = (sal_Int32) PyLong_AsLong( o );
if( l < 128 && l >= -128 ) if( l < 128 && l >= -128 )
{ {
sal_Int8 b = (sal_Int8 ) l; 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)) 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); sal_Int64 l = (sal_Int64)PyLong_AsLong (o);
if( l < 128 && l >= -128 ) if( l < 128 && l >= -128 )
{ {
@@ -720,16 +737,19 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
{ {
a <<= l; a <<= l;
} }
#if PY_MAJOR_VERSION >= 3
}
#endif
} }
else if (PyFloat_Check (o)) else if (PyFloat_Check (o))
{ {
double d = PyFloat_AsDouble (o); double d = PyFloat_AsDouble (o);
a <<= d; a <<= d;
} }
else if (PyString_Check (o)) else if (PyString_Check(o) || PyUnicode_Check(o))
a <<= pyString2ustring(o); {
else if( PyUnicode_Check( o ) ) a <<= pyString2ustring(o);
a <<= pyString2ustring(o); }
else if (PyTuple_Check (o)) else if (PyTuple_Check (o))
{ {
Sequence<Any> s (PyTuple_Size (o)); Sequence<Any> s (PyTuple_Size (o));

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

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

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

@@ -132,56 +132,56 @@ def createSingleServiceFactory( clazz, implementationName, serviceNames ):
return _FactoryHelper_( clazz, implementationName, serviceNames ) return _FactoryHelper_( clazz, implementationName, serviceNames )
class _ImplementationHelperEntry: class _ImplementationHelperEntry:
def __init__(self, ctor,serviceNames): def __init__(self, ctor,serviceNames):
self.ctor = ctor self.ctor = ctor
self.serviceNames = serviceNames self.serviceNames = serviceNames
class ImplementationHelper: class ImplementationHelper:
def __init__(self): def __init__(self):
self.impls = {} self.impls = {}
def addImplementation( self, ctor, implementationName, serviceNames ): def addImplementation( self, ctor, implementationName, serviceNames ):
self.impls[implementationName] = _ImplementationHelperEntry(ctor,serviceNames) self.impls[implementationName] = _ImplementationHelperEntry(ctor,serviceNames)
def writeRegistryInfo( self, regKey, smgr ): def writeRegistryInfo( self, regKey, smgr ):
for i in self.impls.items(): for i in list(self.impls.items()):
keyName = "/"+ i[0] + "/UNO/SERVICES" keyName = "/"+ i[0] + "/UNO/SERVICES"
key = regKey.createKey( keyName ) key = regKey.createKey( keyName )
for serviceName in i[1].serviceNames: for serviceName in i[1].serviceNames:
key.createKey( serviceName ) key.createKey( serviceName )
return 1 return 1
def getComponentFactory( self, implementationName , regKey, smgr ): def getComponentFactory( self, implementationName , regKey, smgr ):
entry = self.impls.get( implementationName, None ) entry = self.impls.get( implementationName, None )
if entry == None: if entry == None:
raise RuntimeException( implementationName + " is unknown" , None ) raise RuntimeException( implementationName + " is unknown" , None )
return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames ) return createSingleServiceFactory( entry.ctor, implementationName, entry.serviceNames )
def getSupportedServiceNames( self, implementationName ): def getSupportedServiceNames( self, implementationName ):
entry = self.impls.get( implementationName, None ) entry = self.impls.get( implementationName, None )
if entry == None: if entry == None:
raise RuntimeException( implementationName + " is unknown" , None ) raise RuntimeException( implementationName + " is unknown" , None )
return entry.serviceNames return entry.serviceNames
def supportsService( self, implementationName, serviceName ): def supportsService( self, implementationName, serviceName ):
entry = self.impls.get( implementationName,None ) entry = self.impls.get( implementationName,None )
if entry == None: if entry == None:
raise RuntimeException( implementationName + " is unknown", None ) raise RuntimeException( implementationName + " is unknown", None )
return serviceName in entry.serviceNames return serviceName in entry.serviceNames
class ImplementationEntry: class ImplementationEntry:
def __init__(self, implName, supportedServices, clazz ): def __init__(self, implName, supportedServices, clazz ):
self.implName = implName self.implName = implName
self.supportedServices = supportedServices self.supportedServices = supportedServices
self.clazz = clazz self.clazz = clazz
def writeRegistryInfoHelper( smgr, regKey, seqEntries ): def writeRegistryInfoHelper( smgr, regKey, seqEntries ):
for entry in seqEntries: for entry in seqEntries:
keyName = "/"+ entry.implName + "/UNO/SERVICES" keyName = "/"+ entry.implName + "/UNO/SERVICES"
key = regKey.createKey( keyName ) key = regKey.createKey( keyName )
for serviceName in entry.supportedServices: for serviceName in entry.supportedServices:
key.createKey( serviceName ) key.createKey( serviceName )
def systemPathToFileUrl( systemPath ): def systemPathToFileUrl( systemPath ):
"returns a file-url for the given system path" "returns a file-url for the given system path"
@@ -197,8 +197,8 @@ def absolutize( path, relativeUrl ):
def getComponentFactoryHelper( implementationName, smgr, regKey, seqEntries ): def getComponentFactoryHelper( implementationName, smgr, regKey, seqEntries ):
for x in seqEntries: for x in seqEntries:
if x.implName == implementationName: if x.implName == implementationName:
return createSingleServiceFactory( x.clazz, implementationName, x.supportedServices ) return createSingleServiceFactory( x.clazz, implementationName, x.supportedServices )
def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls, loaderName ): def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls, loaderName ):
smgr = contextRuntime.ServiceManager smgr = contextRuntime.ServiceManager
@@ -210,56 +210,56 @@ def addComponentsToContext( toBeExtendedContext, contextRuntime, componentUrls,
# create a temporary registry # create a temporary registry
for componentUrl in componentUrls: for componentUrl in componentUrls:
reg = smgr.createInstanceWithContext( "com.sun.star.registry.SimpleRegistry", contextRuntime ) reg = smgr.createInstanceWithContext( "com.sun.star.registry.SimpleRegistry", contextRuntime )
reg.open( "", 0, 1 ) reg.open( "", 0, 1 )
if not isWin and componentUrl.endswith( ".uno" ): # still allow platform independent naming if not isWin and componentUrl.endswith( ".uno" ): # still allow platform independent naming
if isMac: if isMac:
componentUrl = componentUrl + ".dylib" componentUrl = componentUrl + ".dylib"
else: else:
componentUrl = componentUrl + ".so" componentUrl = componentUrl + ".so"
implReg.registerImplementation( loaderName,componentUrl, reg ) implReg.registerImplementation( loaderName,componentUrl, reg )
rootKey = reg.getRootKey() rootKey = reg.getRootKey()
implementationKey = rootKey.openKey( "IMPLEMENTATIONS" ) implementationKey = rootKey.openKey( "IMPLEMENTATIONS" )
implNames = implementationKey.getKeyNames() implNames = implementationKey.getKeyNames()
extSMGR = toBeExtendedContext.ServiceManager extSMGR = toBeExtendedContext.ServiceManager
for x in implNames: for x in implNames:
fac = loader.activate( max(x.split("/")),"",componentUrl,rootKey) fac = loader.activate( max(x.split("/")),"",componentUrl,rootKey)
extSMGR.insert( fac ) extSMGR.insert( fac )
reg.close() reg.close()
# never shrinks ! # never shrinks !
_g_typeTable = {} _g_typeTable = {}
def _unohelper_getHandle( self): def _unohelper_getHandle( self):
ret = None ret = None
if _g_typeTable.has_key( self.__class__ ): if self.__class__ in _g_typeTable:
ret = _g_typeTable[self.__class__] ret = _g_typeTable[self.__class__]
else: else:
names = {} names = {}
traverse = list(self.__class__.__bases__) traverse = list(self.__class__.__bases__)
while len( traverse ) > 0: while len( traverse ) > 0:
item = traverse.pop() item = traverse.pop()
bases = item.__bases__ bases = item.__bases__
if uno.isInterface( item ): if uno.isInterface( item ):
names[item.__pyunointerface__] = None names[item.__pyunointerface__] = None
elif len(bases) > 0: elif len(bases) > 0:
# the "else if", because we only need the most derived interface # the "else if", because we only need the most derived interface
traverse = traverse + list(bases)# traverse = traverse + list(bases)#
lst = names.keys() lst = list(names.keys())
types = [] types = []
for x in lst: for x in lst:
t = uno.getTypeByName( x ) t = uno.getTypeByName( x )
types.append( t ) types.append( t )
ret = tuple(types) , uno.generateUuid() ret = tuple(types) , uno.generateUuid()
_g_typeTable[self.__class__] = ret _g_typeTable[self.__class__] = ret
return ret return ret
class Base(XTypeProvider): class Base(XTypeProvider):
def getTypes( self ): def getTypes( self ):
return _unohelper_getHandle( self )[0] return _unohelper_getHandle( self )[0]
def getImplementationId(self): def getImplementationId(self):
return _unohelper_getHandle( self )[1] return _unohelper_getHandle( self )[1]
class CurrentContext(XCurrentContext, Base ): class CurrentContext(XCurrentContext, Base ):
"""a current context implementation, which first does a lookup in the given """a current context implementation, which first does a lookup in the given
@@ -282,23 +282,23 @@ class CurrentContext(XCurrentContext, Base ):
# implementation details # implementation details
# ------------------------------------------------- # -------------------------------------------------
class _FactoryHelper_( XSingleComponentFactory, XServiceInfo, Base ): class _FactoryHelper_( XSingleComponentFactory, XServiceInfo, Base ):
def __init__( self, clazz, implementationName, serviceNames ): def __init__( self, clazz, implementationName, serviceNames ):
self.clazz = clazz self.clazz = clazz
self.implementationName = implementationName self.implementationName = implementationName
self.serviceNames = serviceNames self.serviceNames = serviceNames
def getImplementationName( self ): def getImplementationName( self ):
return self.implementationName return self.implementationName
def supportsService( self, ServiceName ): def supportsService( self, ServiceName ):
return ServiceName in self.serviceNames return ServiceName in self.serviceNames
def getSupportedServiceNames( self ): def getSupportedServiceNames( self ):
return self.serviceNames return self.serviceNames
def createInstanceWithContext( self, context ): def createInstanceWithContext( self, context ):
return self.clazz( context ) return self.clazz( context )
def createInstanceWithArgumentsAndContext( self, args, context ): def createInstanceWithArgumentsAndContext( self, args, context ):
return self.clazz( context, *args ) return self.clazz( context, *args )

2
pyuno/zipcore/makefile.mk
View File

@@ -59,7 +59,7 @@ FINDLIBFILES_TMP:=$(subst,/,$/ \
FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP)) FINDLIBFILES=$(subst,$(SOLARLIBDIR)$/python, $(FINDLIBFILES_TMP))
FILES=\ FILES=\
$(PYTHONBINARY) \ $(PYTHONBINARY) \
$(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i)) $(foreach,i,$(FINDLIBFILES) $(DESTROOT)$/lib$(i))
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"