Commit Graph

25 Commits

Author SHA1 Message Date
Stephan Bergmann
d6c63c9a84 Remove whitespace from line ends
Change-Id: Ie894879eaebda32bc4f99e7ad7f810c569e86a7a
2013-07-29 11:35:18 +02:00
David Bolen
948b6ea02e fdo#66025: Improve accuracy of ImportError traceback and message
The ImportError raised on an import failure with the uno module loaded
now includes a complete traceback and the original Python exception
message text, combined with the most relevant (nearest to failure if
imports are nested) uno lookup that also failed.

Change-Id: Id968d84d7f09d555a81017a99369beb503d61439
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-29 11:35:18 +02:00
David Bolen
fbe28de6fb fdo#66025: Simplify new ImportError logic
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-24 15:26:10 +02:00
David Bolen
329125abb6 fdo#66025: Minor clean-up of previous patch
Change-Id: Idaaf8ebbf419899ba04b77cf10b217c141652a3a
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-24 13:04:25 +02:00
David Bolen
7fd81244c2 fdo#66025: Improve ImportError raised from _uno_import
Change-Id: I92301f0c37d69e5977a12ab4d5a360f7a4ff20fe
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-24 10:04:44 +02:00
Michael Stahl
a38b59265c pyuno: adjust uno.ByteSequence to work with "bytes"
This is necessary for Python3; "str" type is still accepted so it runs
on Python 2 as well.

Change-Id: I51098feca00e4cd8ce3ceebf663d4ce79252cbcd
2012-11-25 16:06:40 +01:00
Michael Meeks
1d3e6bb6c4 re-base on ALv2 code. Removing:
a patch contributed by Pedro Giffuni to handle FreeBSD issues
    that are unlikely to be an issue with a two-layer LibreOffice.
    http://svn.apache.org/viewvc?view=revision&revision=1180509
2012-07-02 16:52:50 +01:00
David Bolen
4634cbc237 fdo#46859: adapt string type checks to work with both Python 2 and 3
(regression from a09ce46818)
2012-03-07 11:17:13 +01:00
Michael Meeks
1a7eee2446 Improve pyuno debugging in various ways - add stack traces etc. 2011-12-05 20:53:24 +00:00
Lionel Elie Mamane
41a68a4f77 pyuno: hook into import *after* the _whole_ uno module is successfully loaded
This avoids breaking the whole python process module importing
when an uno.py import failure happens after the hooking point.
In that case, _uno_import is still the python module loader,
but _g_delegatee is not anymore bound to the previously installed
importer, and thus any module import fails with:
  File "/home/master/src/libreoffice/core/install/basis3.5/program/uno.py", line 260, in _uno_import
    return _g_delegatee( name, *optargs, **kwargs )
TypeError: 'NoneType' object is not callable
2011-08-21 01:46:07 +02:00
Lionel Elie Mamane
a9b9b40570 pyuno: allow uno structs to be initliased with keyword arguments 2011-08-21 01:46:07 +02:00
Christian Lohmaier
c78b2702a4 minor whitespace/makefile cleanup 2011-07-24 19:23:32 +02:00
Andreas Becker
a09ce46818 Port PyUno to support Python 3 2011-05-07 20:35:03 +01:00
Jens-Heiner Rechtien
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Ivo Hinkelmann
8ae4080d46 CWS-TOOLING: integrate CWS python26
2009-04-22 11:57:41 +0200 obo  r271091 : #i101079# mingw port (by tono)
2009-04-22 11:56:37 +0200 obo  r271090 : #i101079# mingw port (by tono)
2009-04-22 11:55:55 +0200 obo  r271089 : #i101079# mingw port (by tono)
2009-04-22 11:26:00 +0200 obo  r271084 : #i100492# Patch for FreeBSD (by maho)
2009-04-21 10:19:01 +0200 obo  r271020 : #i92413# make python buildable in Hamburg RE environment
2009-04-17 15:52:57 +0200 obo  r270952 : #i10000# fix for 4NT shell support
2009-04-17 15:16:39 +0200 hjs  r270951 : #i92413# - remove gcc warnings about new struct member. fetched fomr DEV300
2009-04-17 10:30:28 +0200 sb  r270927 : #i92413# adaptions for Solaris and/or bash
2009-04-16 00:36:32 +0200 jbu  r270861 : #i101080# patch for bash environment provided by tono
2009-04-15 13:50:01 +0200 rene  r270842 : #i100997# allow also python < 2.6 again
2009-03-12 14:23:32 +0100 rene  r269410 : cleanup: remove Python 2.3.4 - not referenced anymore
2009-03-11 21:48:58 +0100 jbu  r269356 : native python modules pyuno.dll -> pyuno.pyd (required by 2.6 python runtime)
2009-03-11 11:11:43 +0100 rene  r269307 : fix typo; regen configure
2009-03-10 11:44:54 +0100 rene  r269262 : update _AM_PYTHON_INTERPRETER_LIST
2009-03-10 00:30:09 +0100 jbu  r269233 : python26 now builds on windows (installation set not built yet)
2009-03-06 21:45:20 +0100 jbu  r269050 : python 2.6.1-linuxx86: PYTHONHOME variable removed from set_soenv.in (is now unecessary), added new and removed old python blob, linux x86 builds without patches, windows build still needs to be done and is now broken
2009-03-06 14:08:33 +0100 rene  r269004 : #i92413#
2009-04-22 14:05:37 +00:00
Rüdiger Timm
392fb06810 CWS-TOOLING: integrate CWS sb101
2008-12-08 16:52:06 +0100 sb  r265009 : #i95330# python23.dll needs to be copied to brand layer, not just moved there
2008-11-24 18:15:54 +0100 sb  r264259 : #i95022# tools::extendApplicationEnvironment gets URE_BOOTSTRAP value from outside bootstrap.cxx, so needs to operate in LOOKUP_MODE_URE_BOOTSTRAP, too
2008-11-20 21:12:31 +0100 jbu  r264103 : deactivated debug log
2008-11-20 21:09:03 +0100 jbu  r264102 : #i95331# ld_library_path now contains ure/lib directory
2008-11-20 21:05:37 +0100 jbu  r264101 : #i95330# python.dll is now installed in the brand-program directory (unix remains unchanged)
2008-11-20 20:46:57 +0100 jbu  r264099 : #i95118# + #i93994# Python scripts in share and user uno packages now work again
2008-11-20 20:38:23 +0100 jbu  r264098 : #i95037# python wrapper now waits for completion of python executable and currectly returns the exit state
2008-11-20 10:46:28 +0100 sb  r264034 : #i95028# import socket, since on Windows sal3.dll no longer calls WSAStartup (and import socket does)
2008-11-18 17:01:09 +0100 sb  r263784 : #i96314# fixed encode()
2008-11-18 15:59:17 +0100 sb  r263779 : #i95024# missing vnd.sun.star.pathname: in URE_BOOTSTRAP
2008-11-18 13:51:36 +0100 sb  r263765 : #i95022# treat \ and $ verbatim in URE_BOOTSTRAP=vnd.sun.star.pathname values
2008-12-11 12:57:12 +00:00
Rüdiger Timm
49a67ecbad INTEGRATION: CWS changefileheader (1.8.12); FILE MERGED
2008/03/31 07:24:58 rt 1.8.12.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:36:09 +00:00
Kurt Zenker
4dbc6d4227 INTEGRATION: CWS pyunofixes4 (1.7.46); FILE MERGED
2007/07/30 19:43:44 jbu 1.7.46.1: adding pythonpath import functionality, fixed a gc deadlock, fixed some minor issues
2007-10-11 10:52:39 +00:00
Oliver Bolte
f6e480a312 INTEGRATION: CWS pyunofixes2 (1.5.40); FILE MERGED
2006/01/07 21:36:28 jbu 1.5.40.2: RESYNC: (1.5-1.6); FILE MERGED
2006/01/07 20:13:41 jbu 1.5.40.1: #i57379# added pyuno current context support
2006-03-22 09:52:57 +00:00
Rüdiger Timm
20fd51a3dd INTEGRATION: CWS ooo19126 (1.5.42); FILE MERGED
2005/09/05 18:39:22 rt 1.5.42.1: #i54170# Change license header: remove SISSL
2005-09-08 15:54:32 +00:00
Jens-Heiner Rechtien
deebfd1738 INTEGRATION: CWS geordi2q14 (1.4.34); FILE MERGED
2004/01/29 18:09:58 hr 1.4.34.1: #111934#: merge CWS ooo111fix2
2004-02-02 18:31:01 +00:00
Jörg Budischewski
b7c79567c0 #i12504# added uno.Any and uno.invoke 2003-05-24 22:24:27 +00:00
Jörg Budischewski
8aa6ac50c5 #i11753# added traceback extraction function 2003-04-06 16:13:09 +00:00
Jörg Budischewski
8b829bbe3e #i12673# some cosmetics and small bugfixes (provided by zagy) 2003-03-30 12:32:01 +00:00
Jörg Budischewski
e80bdbafeb initial checkin for the pyuno-0.9.2 release 2003-03-23 11:12:59 +00:00