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

INTEGRATION: CWS pyunosystempaths_DEV300 (1.6.32); FILE MERGED

Browse Source 
2008/04/23 06:30:40 fs 1.6.32.1: #i86251# committing on behalf of jbu@openoffice.org - proper system path encodings
This commit is contained in:
Kurt Zenker
2008-05-20 13:32:05 +00:00
parent c1ec81b8dc
commit e58d0f6e03
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripting/source/pyprov/pythonscript.py
View File

@@ -20,6 +20,9 @@ LOG_STDOUT = True # True, writes to stdout (difficult
ENABLE_EDIT_DIALOG=False # offers a minimal editor for editing. ENABLE_EDIT_DIALOG=False # offers a minimal editor for editing.
#------------------------------------------------------------------- #-------------------------------------------------------------------
def encfile(uni):
return uni.encode( sys.getfilesystemencoding())
def lastException2String(): def lastException2String():
(excType,excInstance,excTraceback) = sys.exc_info() (excType,excInstance,excTraceback) = sys.exc_info()
ret = str(excType) + ": "+str(excInstance) + "\n" + \ ret = str(excType) + ": "+str(excInstance) + "\n" + \
@@ -74,7 +77,7 @@ class Logger(LogLevel):
" [" + " [" +
logLevel2String( level ) + logLevel2String( level ) +
"] " + "] " +
msg + encfile(msg) +
"\n" ) "\n" )
self.target.flush() self.target.flush()
except Exception,e: except Exception,e:
@@ -142,17 +145,18 @@ def ensureSourceState( code ):
code = code.replace( "\r", "" ) code = code.replace( "\r", "" )
return code return code
def checkForPythonPathBesideScript( url ): def checkForPythonPathBesideScript( url ):
if url.startswith( "file:" ): if url.startswith( "file:" ):
path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" ); path = unohelper.fileUrlToSystemPath( url+"/pythonpath.zip" );
log.log( LogLevel.DEBUG, "checking for existence of " + path ) log.log( LogLevel.DEBUG, "checking for existence of " + path )
if 1 == os.access( 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:
log.log( LogLevel.DEBUG, "adding " + path + " to sys.path" ) log.log( LogLevel.DEBUG, "adding " + path + " to sys.path" )
sys.path.append( path ) sys.path.append( path )
path = unohelper.fileUrlToSystemPath( url+"/pythonpath" ); path = unohelper.fileUrlToSystemPath( url+"/pythonpath" );
log.log( LogLevel.DEBUG, "checking for existence of " + path ) log.log( LogLevel.DEBUG, "checking for existence of " + path )
if 1 == os.access( 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:
log.log( LogLevel.DEBUG, "adding " + path + " to sys.path" ) log.log( LogLevel.DEBUG, "adding " + path + " to sys.path" )
sys.path.append( path ) sys.path.append( path )
@@ -295,7 +299,7 @@ class ProviderContext:
code = None code = None
if url.startswith( "file:" ): if url.startswith( "file:" ):
code = compile( src, uno.fileUrlToSystemPath( url ), "exec" ) code = compile( src, encfile(uno.fileUrlToSystemPath( url ) ), "exec" )
else: else:
code = compile( src, url, "exec" ) code = compile( src, url, "exec" )
exec code in entry.module.__dict__ exec code in entry.module.__dict__