Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Bring nsISupportsPrimitives support into the unicode world.

Browse Source 
* test_isupports_primitives moves to unittest and tests unicode.
* More overloads for PyObject_FromNSString, dropping PyUnicode_FromPRUnichar.
* PyExc_MemoryError translated to NS_ERROR_OUT_OF_MEMORY
* PyXPCOM_FormatCurrentException becomes public.
* Add more type slots, even though we don't use them yet.


git-svn-id: svn://10.0.0.236/branches/DOM_AGNOSTIC_BRANCH@181432 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2005-10-02 13:00:15 +00:00
parent 1b5cd0ea52
commit 4686cd2578
13 changed files with 174 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/extensions/python/xpcom/src/ErrorUtils.cpp
View File

@@ -51,7 +51,6 @@
#include "nspr.h" // PR_fprintf
static char *PyTraceback_AsString(PyObject *exc_tb);
static PRBool PyXPCOM_FormatCurrentException(nsCString &streamout);
// The internal helper that actually moves the
// formatted string to the target!
@@ -225,15 +224,17 @@ nsresult PyXPCOM_SetCOMErrorFromPyException()
if (!PyErr_Occurred())
// No error occurred
return NS_OK;
nsresult rv = NS_ERROR_FAILURE;
if (PyErr_ExceptionMatches(PyExc_MemoryError))
rv = NS_ERROR_OUT_OF_MEMORY;
// todo:
// * Translate PyExc_MemoryError to NS_ERROR_OUT_OF_MEMORY
// * Set an exception using the exception service.
// Once we have returned to pyxpcom, we don't want to leave a
// Once we have returned to the xpcom caller, we don't want to leave a
// Python exception pending - it may get noticed when the next call
// is made on the same thread.
PyErr_Clear();
return NS_ERROR_FAILURE;
return rv;
}
/* Obtains a string from a Python traceback.