diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:28:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:28:45 +0000 |
| commit | 41040742ec5004750f46bc2714114e8fde78cf47 (patch) | |
| tree | 49738e942d09b86892632680a59c16c3af4d0a55 /pyuno | |
| parent | ddddc5f914381078638475a4c919b2cd5fb67601 (diff) | |
INTEGRATION: CWS geordi2q14 (1.2.34); FILE MERGED
2004/01/29 18:09:47 hr 1.2.34.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/pythonloader.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index 386795594..8ec6c98f6 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -2,9 +2,9 @@ # # $RCSfile: pythonloader.py,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: jbu $ $Date: 2003-04-06 17:16:47 $ +# last change: $Author: hr $ $Date: 2004-02-02 19:28:45 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -99,11 +99,13 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): try: if "file" == protocol: + # remove \..\ sequence, which may be useful e.g. in the build env + url = unohelper.absolutize( url, url ) + + # did we load the module already ? mod = g_loadedComponents.get( url ) if not mod: mod = imp.new_module("uno_component") - # remove \..\ sequence, which may be useful e.g. in the build env - url = unohelper.absolutize( url, url ) # read the file fileHandle = file( unohelper.fileUrlToSystemPath( url ) ) |