.gitignore ez_setup.py tests/unicode_test.py @@ -20,6 +20,7 @@ cdef extern from "stdio.h": cdef extern from "string.h": cdef char* strcpy(char* restrict, char* restrict) + cdef void* memcpy(void* dest, void* src, size_t num) cdef extern from "stdlib.h": cdef void* malloc(size_t size) @@ -27,6 +28,9 @@ cdef extern from "stdlib.h": cdef extern from "Python.h": cdef struct PyObject + cdef void Py_DECREF(PyObject* o) + cdef PyObject* PyString_FromStringAndSize(char* buf, size_t length) + cdef int PyString_AsStringAndSize(PyObject* str, char** buf, int* length) cdef extern from "jsapi.h": cdef struct JSClass @@ -225,14 +229,15 @@ cdef extern from "jsapi.h": cdef JSBool JS_SetPrivate(JSContext* cx, JSObject* obj, void* data) # Property Methods - cdef JSBool JS_GetProperty(JSContext* cx, JSObject* obj, char* name, jsval* vp) - cdef JSBool JS_SetProperty(JSContext* cx, JSObject* obj, char* name, jsval* vp) - cdef JSBool JS_DeleteProperty(JSContext* cx, JSObject* obj, char* name) + cdef JSBool JS_GetUCProperty(JSContext* cx, JSObject* obj, jschar* name, size_t slen, jsval* vp) + cdef JSBool JS_SetUCProperty(JSContext* cx, JSObject* obj, jschar* name, size_t slen, jsval* vp) + cdef JSBool JS_DeleteUCProperty2(JSContext* cx, JSObject* obj, jschar* name, size_t slen, jsval* vp) - cdef JSBool JS_DefineProperty( + cdef JSBool JS_DefineUCProperty( JSContext* cx, JSObject* obj, - char* name, + jschar* name, + size_t slen, jsval value, JSPropertyOp getter, JSPropertyOp setter, @@ -267,12 +272,11 @@ cdef extern from "jsapi.h": JSBool JS_GetReservedSlot(JSContext* cx, JSObject* obj, uint32 index, jsval* vp) JSBool JS_SetReservedSlot(JSContext* cx, JSObject* obj, uint32 index, jsval v) - # Set a list of functions on an object cdef JSBool JS_DefineFunctions(JSContext* cx, JSObject* obj, JSFunctionSpec* fs) # Create a function property - cdef JSFunction* JS_DefineFunction( + cdef JSFunction* JS_DefineUCFunction( JSContext* cx, JSObject* obj, char* name, @@ -312,8 +316,9 @@ cdef extern from "jsapi.h": ) except * # String Functions - cdef JSString* JS_NewStringCopyN(JSContext* cx, char* s, size_t n) + cdef JSString* JS_NewUCStringCopyN(JSContext* cx, jschar* s, size_t n) cdef char* JS_GetStringBytes(JSString* str) + cdef jschar* JS_GetStringChars(JSString* str) cdef size_t JS_GetStringLength(JSString* str) # Double Functions @@ -341,10 +346,10 @@ cdef extern from "jsapi.h": cdef void JS_ReportError(JSContext* cx, char* format, ...) # Main Entry Functions - cdef JSBool JS_EvaluateScript( + cdef JSBool JS_EvaluateUCScript( JSContext* cx, JSObject* obj, - char* bytes, + jschar* bytes, uintN length, char* filename, uintN lineno, @@ -370,13 +375,31 @@ cdef extern from "jshelpers.c": cdef object js_function_fetch(JSContext* cx, JSObject* js_obj) cdef object js_function_destroy(JSContext* cx, JSObject* js_obj) -cdef void *xmalloc(size_t size) except NULL: - cdef void *mem + cdef JSString* py2js_jsstring_c(JSContext* cx, PyObject* str) + cdef PyObject* js2py_jsstring_c(JSString* str) + +cdef void* xmalloc(size_t size) except NULL: + cdef void* mem mem = malloc(size) if <int>mem == 0: raise MemoryError() return mem +cdef JSString* py2js_jsstring(JSContext* cx, object str): + cdef JSString* ret + ret = py2js_jsstring_c(cx, <PyObject*> str) + return ret + +cdef object js2py_jsstring(JSString* str): + cdef PyObject* ret + cdef object var + if str == NULL: + raise TypeError("Unable to convert a NULL JSString.") + ret = js2py_jsstring_c(str) + if ret != NULL: + var = <object> ret + return var + # JavaScript -> Python cdef class Context cdef class Function @@ -389,6 +412,9 @@ cdef class ClassAdapter cdef class ObjectAdapter cdef class FunctionAdapter +def test_utf_16_round_trip(Context cx, data): + return js2py_jsstring(py2js_jsstring(cx.cx, data)) + import inspect import sys import traceback @@ -400,5 +426,5 @@ class JSError(Exception): def __str__(self): return repr(self) def __repr__(self): - return "JavaScript Error: %s" % self.mesg + return self.mesg spidermonkey/jsapi.pxi @@ -24,7 +24,7 @@ cdef JSBool __constructor_callback__(JSContext* cx, JSObject* js_obj, uintN argc for i from 0 <= i < argc: args.append(js2py(pycx, argv[i])) - if hasattr(adapter.py_class, "__jsinit__"): + if hasattr(adapter.py_class, unicode("__jsinit__")): py_rval = adapter.py_class.__jsinit__(pycx, *args) else: py_rval = adapter.py_class(*args) @@ -55,16 +55,14 @@ cdef JSBool __resolve_global_callback__(JSContext* cx, JSObject* js_obj, jsval j pycx = js_context_fetch(cx) key = js2py(pycx, jsv) - + if not js_object_has_data(cx, js_obj): return JS_TRUE; - + adapter = js_object_fetch(cx, js_obj) py_obj = adapter.py_obj - - if isinstance(key, types.StringTypes) and hasattr(py_obj, key): - # Bind to root object. - # Will ref the obj so it doesn't get discarded. + + if isinstance(key, types.UnicodeType) and hasattr(py_obj, key): pycx.bind(key, getattr(py_obj, key)) return JS_TRUE @@ -79,13 +77,14 @@ cdef JSBool __get_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv cdef object key cdef object attr + try: if not js_context_has_data(cx): raise JSError("Unknown JSContext object.") pycx = js_context_fetch(cx) key = js2py(pycx, jsv) - + if not js_object_has_data(cx, js_obj): return JS_TRUE @@ -99,8 +98,8 @@ cdef JSBool __get_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv pass else: rval[0] = py2js(pycx, attr, NULL) - elif isinstance(key, types.StringTypes): - if key[:1] != "_": + elif isinstance(key, types.UnicodeType): + if key[:1] != unicode("_"): try: attr = getattr(py_obj, key) except: @@ -131,7 +130,7 @@ cdef JSBool __set_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv pycx = js_context_fetch(cx) key = js2py(pycx, jsv) value = js2py(pycx, rval[0]) - + if not js_object_has_data(cx, js_obj): return JS_TRUE @@ -140,8 +139,8 @@ cdef JSBool __set_property_callback__(JSContext* cx, JSObject* js_obj, jsval jsv if isinstance(key, (types.IntType, types.LongType)): py_obj[key] = value - elif isinstance(key, types.StringTypes): - if key[:1] != "_" and hasattr(py_obj, key): + elif isinstance(key, types.UnicodeType): + if key[:1] != unicode("_") and hasattr(py_obj, key): attr = getattr(py_obj, key) if not callable(attr): setattr(py_obj, key, value) spidermonkey/jsclass.pxi @@ -83,34 +83,62 @@ cdef class Context: """ cdef ClassAdapter ca cdef jsval jsv + cdef JSString* converted + cdef jschar* data + cdef size_t length - if not isinstance(name, types.StringTypes): - raise TypeError("Name must be a string.") + converted = py2js_jsstring(self.cx, name) + if converted == NULL: + raise TypeError("Name to bind must be in unicode.") + + data = JS_GetStringChars(converted) + length = JS_GetStringLength(converted) ca = self.install_class(obj.__class__) jsv = py2js(self, obj, self.root.js_obj) - if not JS_DefineProperty(self.cx, self.root.js_obj, name, jsv, + if not JS_DefineUCProperty(self.cx, self.root.js_obj, data, length, jsv, __get_property_callback__, __set_property_callback__, 0): raise JSError("Failed to bind Python object to the global object.") def unbind(Context self, name): - ret = self.execute("%s;" % name) - if not JS_DeleteProperty(self.cx, self.root.js_obj, name): + cdef jsval rval + cdef JSString* converted + cdef jschar* data + cdef size_t length + + converted = py2js_jsstring(self.cx, name) + if converted == NULL: + raise TypeError("Name to unbind must be in unicode.") + + data = JS_GetStringChars(converted) + length = JS_GetStringLength(converted) + + ret = self.execute(name + unicode(";")) # yeah yeah, I know. + if not JS_DeleteUCProperty2(self.cx, self.root.js_obj, data, length, &rval): raise JSError("Failed to unbind property: %s" % name) + # This always returns True for some reason + #return js2py(self, rval) return ret - def execute(Context self, object script): + def execute(Context self, script): """\ Execute JavaScript source code. """ cdef jsval rval - try: - if not isinstance(script, types.StringTypes): - raise TypeError("Script must be a string.") + cdef JSString* converted + cdef jschar* data + cdef size_t length - if not JS_EvaluateScript(self.cx, self.root.js_obj, script, len(script), "Python", 0, &rval): - raise JSError(self.error) + converted = py2js_jsstring(self.cx, script) + if converted == NULL: + raise TypeError("Script must be in unicode.") + + data = JS_GetStringChars(converted) + length = JS_GetStringLength(converted) + try: + if not JS_EvaluateUCScript(self.cx, self.root.js_obj, data, length, "Python", 0, &rval): + raise JSError(self.error) return js2py(self, rval) finally: self.gc.run_maybe() spidermonkey/jscontext.pxi @@ -10,7 +10,7 @@ cdef void __report_error_callback__(JSContext* cx, char* message, JSErrorReport* try: if not js_context_has_data(cx): - sys.stderr.write("Attempting to report error for an unknown JSContext.") + sys.stderr.write("Attempting to report error for an unknown JSContext.\n") return pycx = js_context_fetch(cx) spidermonkey/jserror.pxi @@ -13,6 +13,9 @@ cdef object js2py_hash(Context cx, jsval v): cdef jsval jsv cdef int i cdef dict ret + cdef JSString* converted + cdef jschar* data + cdef size_t length hash = JSVAL_TO_OBJECT(v) @@ -29,7 +32,12 @@ cdef object js2py_hash(Context cx, jsval v): if js_is_string(cx, jskey): key = js2py_string(cx, jskey) - if not JS_GetProperty(cx.cx, hash, key, &jsv): + + converted = py2js_jsstring(cx.cx, key) + data = JS_GetStringChars(converted) + length = JS_GetStringLength(converted) + + if not JS_GetUCProperty(cx.cx, hash, data, length, &jsv): raise JSError("Faield to retrieve textual hash property.") elif js_is_int(cx, jskey): key = js2py_int(cx, jskey) @@ -48,14 +56,25 @@ cdef object js2py_hash(Context cx, jsval v): cdef jsval py2js_hash(Context cx, dict py_obj, JSObject* parent): cdef JSObject* obj cdef jsval elem + cdef JSString* converted + cdef jschar* data + cdef size_t length obj = JS_NewObject(cx.cx, NULL, NULL, parent) if obj == NULL: raise JSError("Failed to create new JavaScript object for dict instance.") for k, v in py_obj.iteritems(): + + converted = py2js_jsstring(cx.cx, k) + data = JS_GetStringChars(converted) + length = JS_GetStringLength(converted) + elem = py2js(cx, v, obj) - if not JS_SetProperty(cx.cx, obj, k, &elem): + if elem is None: + sys.stderr.write("\nNONE HERE HERE HERE: %s\n\n" % k) + + if not JS_SetUCProperty(cx.cx, obj, data, length, &elem): raise JSError("Failed to set JavaScript property for dict instance.") return OBJECT_TO_JSVAL(obj) spidermonkey/jshash.pxi @@ -1,3 +1,50 @@ +JSString* py2js_jsstring_c(JSContext* cx, PyObject* str) +{ + PyObject* encoded = NULL; + char* bytes; + Py_ssize_t len; + + if(!PyUnicode_Check(str)) + { + return NULL; + } + + encoded = PyUnicode_AsEncodedString(str, "utf-16", "strict"); + if(encoded == NULL) + { + return NULL; + } + + if(PyString_AsStringAndSize(encoded, &bytes, &len) < 0) + { + return NULL; + } + + if(len < 4) + { + return NULL; + } + + // No idea why python adds FFFE to encoded UTF-16 data. + return JS_NewUCStringCopyN(cx, bytes+2, (len/2)-1); +} + +PyObject* js2py_jsstring_c(JSString* str) +{ + jschar* bytes; + size_t len; + + if(str == NULL) + { + return NULL; + } + + len = JS_GetStringLength(str); + bytes = JS_GetStringChars(str); + + return PyUnicode_Decode((const char*) bytes, (size_t) (len * 2), "utf-16", "strict"); +} + void js_context_attach(JSContext* cx, PyObject* obj) { spidermonkey/jshelpers.c @@ -5,17 +5,12 @@ def js_is_string(Context cx, jsval jsv): return JSVAL_IS_STRING(jsv) def py_is_string(Context cx, object py_obj): - return isinstance(py_obj, types.StringTypes) + return isinstance(py_obj, types.UnicodeType) -cdef object js2py_string(Context cx, jsval jsv): - cdef JSString* s - s = JSVAL_TO_STRING(jsv) - return JS_GetStringBytes(s) - -################################################# -# NEEED TO REWWRITE TO USE JS_NewExternalString # -################################################# cdef jsval py2js_string(Context cx, object py_obj, JSObject* parent): - cdef JSString* s - s = JS_NewStringCopyN(cx.cx, py_obj, len(py_obj)) - return STRING_TO_JSVAL(s) + cdef JSString* conv + conv = py2js_jsstring(cx.cx, py_obj) + return STRING_TO_JSVAL(conv) + +cdef object js2py_string(Context cx, jsval jsv): + return js2py_jsstring(JSVAL_TO_STRING(jsv)) spidermonkey/jsstring.pxi @@ -1,4 +1,4 @@ -/* Generated by Pyrex 0.9.8.5 on Wed Jan 28 06:18:02 2009 */ +/* Generated by Pyrex 0.9.8.5 on Fri Jan 30 03:27:19 2009 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -44,6 +44,8 @@ static char **__pyx_f; static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ +static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/ + static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/ static void __Pyx_WriteUnraisable(char *name); /*proto*/ @@ -52,8 +54,6 @@ static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/ -static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/ - static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], Py_ssize_t nargs, PyObject **args2, PyObject **kwds2, char rqd_kwds[]); /*proto*/ static int __Pyx_SetItemInt(PyObject *o, Py_ssize_t i, PyObject *v); /*proto*/ @@ -185,6 +185,8 @@ static PyTypeObject *__pyx_ptype_12spidermonkey_ClassAdapter = 0; static PyTypeObject *__pyx_ptype_12spidermonkey_ObjectAdapter = 0; static PyTypeObject *__pyx_ptype_12spidermonkey_FunctionAdapter = 0; static void *__pyx_f_12spidermonkey_xmalloc(__pyx_t_12spidermonkey_size_t); /*proto*/ +static struct JSString *__pyx_f_12spidermonkey_py2js_jsstring(struct JSContext *,PyObject *); /*proto*/ +static PyObject *__pyx_f_12spidermonkey_js2py_jsstring(struct JSString *); /*proto*/ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey_report_python_error(struct JSContext *); /*proto*/ static void __pyx_f_12spidermonkey___report_error_callback__(struct JSContext *,char *,struct JSErrorReport *); /*proto*/ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___constructor_callback__(struct JSContext *,struct JSObject *,__pyx_t_12spidermonkey_uintN,__pyx_t_12spidermonkey_jsval *,__pyx_t_12spidermonkey_jsval *); /*proto*/ @@ -209,22 +211,22 @@ static PyObject *__pyx_f_12spidermonkey_js2py_hash(struct __pyx_obj_12spidermonk static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_hash(struct __pyx_obj_12spidermonkey_Context *,PyDictObject *,struct JSObject *); /*proto*/ static PyObject *__pyx_f_12spidermonkey_js2py_int(struct __pyx_obj_12spidermonkey_Context *,__pyx_t_12spidermonkey_jsval); /*proto*/ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_int(struct __pyx_obj_12spidermonkey_Context *,__pyx_t_12spidermonkey_jsint,struct JSObject *); /*proto*/ -static PyObject *__pyx_f_12spidermonkey_js2py_string(struct __pyx_obj_12spidermonkey_Context *,__pyx_t_12spidermonkey_jsval); /*proto*/ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_string(struct __pyx_obj_12spidermonkey_Context *,PyObject *,struct JSObject *); /*proto*/ +static PyObject *__pyx_f_12spidermonkey_js2py_string(struct __pyx_obj_12spidermonkey_Context *,__pyx_t_12spidermonkey_jsval); /*proto*/ static PyObject *__pyx_f_12spidermonkey_js2py_void(struct __pyx_obj_12spidermonkey_Context *,__pyx_t_12spidermonkey_jsval); /*proto*/ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_void(struct __pyx_obj_12spidermonkey_Context *,PyObject *,struct JSObject *); /*proto*/ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js(struct __pyx_obj_12spidermonkey_Context *,PyObject *,struct JSObject *); /*proto*/ static PyObject *__pyx_f_12spidermonkey_js2py(struct __pyx_obj_12spidermonkey_Context *,__pyx_t_12spidermonkey_jsval); /*proto*/ static struct __pyx_obj_12spidermonkey_Value *__pyx_f_12spidermonkey_js_create_value(__pyx_t_12spidermonkey_jsval); /*proto*/ -static char __pyx_k1[] = "mesg"; -static char __pyx_k2[] = "JavaScript Error: %s"; +static char __pyx_k1[] = "Unable to convert a NULL JSString."; +static char __pyx_k2[] = "mesg"; static char __pyx_k3[] = "traceback"; static char __pyx_k4[] = "format_exc"; static char __pyx_k5[] = "sys"; static char __pyx_k6[] = "stderr"; static char __pyx_k7[] = "write"; -static char __pyx_k8[] = "Attempting to report error for an unknown JSContext."; +static char __pyx_k8[] = "Attempting to report error for an unknown JSContext.\n"; static char __pyx_k9[] = "Unknown"; static char __pyx_k10[] = "set_error"; static char __pyx_k11[] = "%s(%d): %s"; @@ -248,86 +250,89 @@ static char __pyx_k28[] = "types"; static char __pyx_k29[] = "IntType"; static char __pyx_k30[] = "LongType"; static char __pyx_k31[] = "Flags is not an integer."; -static char __pyx_k32[] = "StringTypes"; -static char __pyx_k33[] = "Name must be a string."; -static char __pyx_k34[] = "Failed to bind Python object to the global object."; +static char __pyx_k32[] = "Name to bind must be in unicode."; +static char __pyx_k33[] = "Failed to bind Python object to the global object."; +static char __pyx_k34[] = "Name to unbind must be in unicode."; static char __pyx_k35[] = "execute"; -static char __pyx_k36[] = "%s;"; -static char __pyx_k37[] = "Failed to unbind property: %s"; -static char __pyx_k38[] = "Script must be a string."; -static char __pyx_k39[] = "Python"; -static char __pyx_k40[] = "Unknown JSContext object."; -static char __pyx_k41[] = "Object has no prototype."; -static char __pyx_k42[] = "Unknown constructor callback."; -static char __pyx_k43[] = "append"; -static char __pyx_k44[] = "__jsinit__"; -static char __pyx_k45[] = "bind"; -static char __pyx_k46[] = "_"; -static char __pyx_k47[] = "JS_VOID"; -static char __pyx_k48[] = "Invalid key: %r"; -static char __pyx_k49[] = "callable"; -static char __pyx_k50[] = "Unknown JSObject."; -static char __pyx_k51[] = "__name__"; -static char __pyx_k52[] = "__jsname__"; -static char __pyx_k53[] = "js_classname"; -static char __pyx_k54[] = "Failed to bind Python adapter class."; -static char __pyx_k55[] = "<spidermonkey.ClassAdapter: %r>"; -static char __pyx_k56[] = "<spidermonkey.ObjectAdapter: %r>"; -static char __pyx_k57[] = "TypeType"; -static char __pyx_k58[] = "py_obj"; -static char __pyx_k59[] = "Failed to unwrap Python object."; -static char __pyx_k60[] = "Failed to create object."; -static char __pyx_k61[] = "<spidermonkey.FunctionAdapter: %r>"; -static char __pyx_k62[] = "Function call back without attached functor."; -static char __pyx_k63[] = "FunctionType"; -static char __pyx_k64[] = "LambdaType"; -static char __pyx_k65[] = "MethodType"; -static char __pyx_k66[] = "func_name"; -static char __pyx_k67[] = "im_fun"; -static char __pyx_k68[] = "Failed to find function name."; -static char __pyx_k69[] = "ListType"; -static char __pyx_k70[] = "TupleType"; -static char __pyx_k71[] = "Failed to convert JavaScript array to Python."; -static char __pyx_k72[] = "Failed to convert Python sequence type to JavaScript."; -static char __pyx_k73[] = "BooleanType"; -static char __pyx_k74[] = "FloatType"; -static char __pyx_k75[] = "Failed to convert double."; -static char __pyx_k76[] = "DictionaryType"; -static char __pyx_k77[] = "DictType"; -static char __pyx_k78[] = "Failed to enumerate hash properties."; -static char __pyx_k79[] = "Failed to convert dict to JavaScript."; -static char __pyx_k80[] = "js_is_string"; -static char __pyx_k81[] = "Faield to retrieve textual hash property."; -static char __pyx_k82[] = "js_is_int"; -static char __pyx_k83[] = "Failed to retrive numeric hash property."; -static char __pyx_k84[] = "Invalid JavaScript property."; -static char __pyx_k85[] = "Failed to create new JavaScript object for dict instance."; -static char __pyx_k86[] = "iteritems"; -static char __pyx_k87[] = "Failed to set JavaScript property for dict instance."; -static char __pyx_k88[] = "NoneType"; -static char __pyx_k89[] = "py_is_void"; -static char __pyx_k90[] = "py_is_bool"; -static char __pyx_k91[] = "py_is_int"; -static char __pyx_k92[] = "py_is_double"; -static char __pyx_k93[] = "py_is_string"; -static char __pyx_k94[] = "py_is_array"; -static char __pyx_k95[] = "py_is_hash"; -static char __pyx_k96[] = "py_is_bound_method"; -static char __pyx_k97[] = "py_is_function"; -static char __pyx_k98[] = "py_is_object"; -static char __pyx_k99[] = "Unable to convert Python value to JavaScript: %r"; -static char __pyx_k100[] = "js_is_void"; -static char __pyx_k101[] = "js_is_bool"; -static char __pyx_k102[] = "js_is_double"; -static char __pyx_k103[] = "js_is_array"; -static char __pyx_k104[] = "js_is_function"; -static char __pyx_k105[] = "js_is_object"; -static char __pyx_k106[] = "js_is_hash"; -static char __pyx_k107[] = "Unable to convert JavaScript value to Python: %r"; -static char __pyx_k108[] = "__init__"; -static char __pyx_k109[] = "__str__"; -static char __pyx_k110[] = "__repr__"; -static char __pyx_k111[] = "object"; +static char __pyx_k36[] = "unicode"; +static char __pyx_k37[] = ";"; +static char __pyx_k38[] = "Failed to unbind property: %s"; +static char __pyx_k39[] = "Script must be in unicode."; +static char __pyx_k40[] = "Python"; +static char __pyx_k41[] = "Unknown JSContext object."; +static char __pyx_k42[] = "Object has no prototype."; +static char __pyx_k43[] = "Unknown constructor callback."; +static char __pyx_k44[] = "append"; +static char __pyx_k45[] = "__jsinit__"; +static char __pyx_k46[] = "UnicodeType"; +static char __pyx_k47[] = "bind"; +static char __pyx_k48[] = "_"; +static char __pyx_k49[] = "JS_VOID"; +static char __pyx_k50[] = "Invalid key: %r"; +static char __pyx_k51[] = "callable"; +static char __pyx_k52[] = "Unknown JSObject."; +static char __pyx_k53[] = "__name__"; +static char __pyx_k54[] = "__jsname__"; +static char __pyx_k55[] = "js_classname"; +static char __pyx_k56[] = "Failed to bind Python adapter class."; +static char __pyx_k57[] = "<spidermonkey.ClassAdapter: %r>"; +static char __pyx_k58[] = "<spidermonkey.ObjectAdapter: %r>"; +static char __pyx_k59[] = "TypeType"; +static char __pyx_k60[] = "py_obj"; +static char __pyx_k61[] = "Failed to unwrap Python object."; +static char __pyx_k62[] = "Failed to create object."; +static char __pyx_k63[] = "<spidermonkey.FunctionAdapter: %r>"; +static char __pyx_k64[] = "Function call back without attached functor."; +static char __pyx_k65[] = "FunctionType"; +static char __pyx_k66[] = "LambdaType"; +static char __pyx_k67[] = "MethodType"; +static char __pyx_k68[] = "func_name"; +static char __pyx_k69[] = "im_fun"; +static char __pyx_k70[] = "Failed to find function name."; +static char __pyx_k71[] = "ListType"; +static char __pyx_k72[] = "TupleType"; +static char __pyx_k73[] = "Failed to convert JavaScript array to Python."; +static char __pyx_k74[] = "Failed to convert Python sequence type to JavaScript."; +static char __pyx_k75[] = "BooleanType"; +static char __pyx_k76[] = "FloatType"; +static char __pyx_k77[] = "Failed to convert double."; +static char __pyx_k78[] = "DictionaryType"; +static char __pyx_k79[] = "DictType"; +static char __pyx_k80[] = "Failed to enumerate hash properties."; +static char __pyx_k81[] = "Failed to convert dict to JavaScript."; +static char __pyx_k82[] = "js_is_string"; +static char __pyx_k83[] = "Faield to retrieve textual hash property."; +static char __pyx_k84[] = "js_is_int"; +static char __pyx_k85[] = "Failed to retrive numeric hash property."; +static char __pyx_k86[] = "Invalid JavaScript property."; +static char __pyx_k87[] = "Failed to create new JavaScript object for dict instance."; +static char __pyx_k88[] = "iteritems"; +static char __pyx_k89[] = "\nNONE HERE HERE HERE: %s\n\n"; +static char __pyx_k90[] = "Failed to set JavaScript property for dict instance."; +static char __pyx_k91[] = "NoneType"; +static char __pyx_k92[] = "py_is_void"; +static char __pyx_k93[] = "py_is_bool"; +static char __pyx_k94[] = "py_is_int"; +static char __pyx_k95[] = "py_is_double"; +static char __pyx_k96[] = "py_is_string"; +static char __pyx_k97[] = "py_is_array"; +static char __pyx_k98[] = "py_is_hash"; +static char __pyx_k99[] = "py_is_bound_method"; +static char __pyx_k100[] = "py_is_function"; +static char __pyx_k101[] = "py_is_object"; +static char __pyx_k102[] = "Unable to convert Python value to JavaScript: %r"; +static char __pyx_k103[] = "js_is_void"; +static char __pyx_k104[] = "js_is_bool"; +static char __pyx_k105[] = "js_is_double"; +static char __pyx_k106[] = "js_is_array"; +static char __pyx_k107[] = "js_is_function"; +static char __pyx_k108[] = "js_is_object"; +static char __pyx_k109[] = "js_is_hash"; +static char __pyx_k110[] = "Unable to convert JavaScript value to Python: %r"; +static char __pyx_k111[] = "__init__"; +static char __pyx_k112[] = "__str__"; +static char __pyx_k113[] = "__repr__"; +static char __pyx_k114[] = "object"; static PyObject *__pyx_n_BooleanType; static PyObject *__pyx_n_DictType; @@ -343,9 +348,9 @@ static PyObject *__pyx_n_ListType; static PyObject *__pyx_n_LongType; static PyObject *__pyx_n_MethodType; static PyObject *__pyx_n_NoneType; -static PyObject *__pyx_n_StringTypes; static PyObject *__pyx_n_TupleType; static PyObject *__pyx_n_TypeType; +static PyObject *__pyx_n_UnicodeType; static PyObject *__pyx_n_Unknown; static PyObject *__pyx_n__; static PyObject *__pyx_n___class__; @@ -395,9 +400,10 @@ static PyObject *__pyx_n_stderr; static PyObject *__pyx_n_sys; static PyObject *__pyx_n_traceback; static PyObject *__pyx_n_types; +static PyObject *__pyx_n_unicode; static PyObject *__pyx_n_write; -static PyObject *__pyx_k2p; +static PyObject *__pyx_k1p; static PyObject *__pyx_k8p; static PyObject *__pyx_k11p; static PyObject *__pyx_k14p; @@ -410,106 +416,109 @@ static PyObject *__pyx_k23p; static PyObject *__pyx_k24p; static PyObject *__pyx_k27p; static PyObject *__pyx_k31p; +static PyObject *__pyx_k32p; static PyObject *__pyx_k33p; static PyObject *__pyx_k34p; -static PyObject *__pyx_k36p; static PyObject *__pyx_k37p; static PyObject *__pyx_k38p; -static PyObject *__pyx_k40p; +static PyObject *__pyx_k39p; static PyObject *__pyx_k41p; static PyObject *__pyx_k42p; -static PyObject *__pyx_k48p; +static PyObject *__pyx_k43p; static PyObject *__pyx_k50p; -static PyObject *__pyx_k54p; -static PyObject *__pyx_k55p; +static PyObject *__pyx_k52p; static PyObject *__pyx_k56p; -static PyObject *__pyx_k59p; -static PyObject *__pyx_k60p; +static PyObject *__pyx_k57p; +static PyObject *__pyx_k58p; static PyObject *__pyx_k61p; static PyObject *__pyx_k62p; -static PyObject *__pyx_k68p; -static PyObject *__pyx_k71p; -static PyObject *__pyx_k72p; -static PyObject *__pyx_k75p; -static PyObject *__pyx_k78p; -static PyObject *__pyx_k79p; +static PyObject *__pyx_k63p; +static PyObject *__pyx_k64p; +static PyObject *__pyx_k70p; +static PyObject *__pyx_k73p; +static PyObject *__pyx_k74p; +static PyObject *__pyx_k77p; +static PyObject *__pyx_k80p; static PyObject *__pyx_k81p; static PyObject *__pyx_k83p; -static PyObject *__pyx_k84p; static PyObject *__pyx_k85p; +static PyObject *__pyx_k86p; static PyObject *__pyx_k87p; -static PyObject *__pyx_k99p; -static PyObject *__pyx_k107p; +static PyObject *__pyx_k89p; +static PyObject *__pyx_k90p; +static PyObject *__pyx_k102p; +static PyObject *__pyx_k110p; static __Pyx_StringTabEntry __pyx_string_tab[] = { - {&__pyx_n_BooleanType, 1, __pyx_k73, sizeof(__pyx_k73)}, - {&__pyx_n_DictType, 1, __pyx_k77, sizeof(__pyx_k77)}, - {&__pyx_n_DictionaryType, 1, __pyx_k76, sizeof(__pyx_k76)}, - {&__pyx_n_FloatType, 1, __pyx_k74, sizeof(__pyx_k74)}, - {&__pyx_n_FunctionType, 1, __pyx_k63, sizeof(__pyx_k63)}, + {&__pyx_n_BooleanType, 1, __pyx_k75, sizeof(__pyx_k75)}, + {&__pyx_n_DictType, 1, __pyx_k79, sizeof(__pyx_k79)}, + {&__pyx_n_DictionaryType, 1, __pyx_k78, sizeof(__pyx_k78)}, + {&__pyx_n_FloatType, 1, __pyx_k76, sizeof(__pyx_k76)}, + {&__pyx_n_FunctionType, 1, __pyx_k65, sizeof(__pyx_k65)}, {&__pyx_n_IntType, 1, __pyx_k29, sizeof(__pyx_k29)}, {&__pyx_n_JSError, 1, __pyx_k13, sizeof(__pyx_k13)}, {&__pyx_n_JSRootObject, 1, __pyx_k20, sizeof(__pyx_k20)}, - {&__pyx_n_JS_VOID, 1, __pyx_k47, sizeof(__pyx_k47)}, - {&__pyx_n_LambdaType, 1, __pyx_k64, sizeof(__pyx_k64)}, - {&__pyx_n_ListType, 1, __pyx_k69, sizeof(__pyx_k69)}, + {&__pyx_n_JS_VOID, 1, __pyx_k49, sizeof(__pyx_k49)}, + {&__pyx_n_LambdaType, 1, __pyx_k66, sizeof(__pyx_k66)}, + {&__pyx_n_ListType, 1, __pyx_k71, sizeof(__pyx_k71)}, {&__pyx_n_LongType, 1, __pyx_k30, sizeof(__pyx_k30)}, - {&__pyx_n_MethodType, 1, __pyx_k65, sizeof(__pyx_k65)}, - {&__pyx_n_NoneType, 1, __pyx_k88, sizeof(__pyx_k88)}, - {&__pyx_n_StringTypes, 1, __pyx_k32, sizeof(__pyx_k32)}, - {&__pyx_n_TupleType, 1, __pyx_k70, sizeof(__pyx_k70)}, - {&__pyx_n_TypeType, 1, __pyx_k57, sizeof(__pyx_k57)}, + {&__pyx_n_MethodType, 1, __pyx_k67, sizeof(__pyx_k67)}, + {&__pyx_n_NoneType, 1, __pyx_k91, sizeof(__pyx_k91)}, + {&__pyx_n_TupleType, 1, __pyx_k72, sizeof(__pyx_k72)}, + {&__pyx_n_TypeType, 1, __pyx_k59, sizeof(__pyx_k59)}, + {&__pyx_n_UnicodeType, 1, __pyx_k46, sizeof(__pyx_k46)}, {&__pyx_n_Unknown, 1, __pyx_k9, sizeof(__pyx_k9)}, - {&__pyx_n__, 1, __pyx_k46, sizeof(__pyx_k46)}, + {&__pyx_n__, 1, __pyx_k48, sizeof(__pyx_k48)}, {&__pyx_n___class__, 1, __pyx_k22, sizeof(__pyx_k22)}, - {&__pyx_n___init__, 1, __pyx_k108, sizeof(__pyx_k108)}, - {&__pyx_n___jsinit__, 1, __pyx_k44, sizeof(__pyx_k44)}, - {&__pyx_n___jsname__, 1, __pyx_k52, sizeof(__pyx_k52)}, - {&__pyx_n___name__, 1, __pyx_k51, sizeof(__pyx_k51)}, - {&__pyx_n___repr__, 1, __pyx_k110, sizeof(__pyx_k110)}, - {&__pyx_n___str__, 1, __pyx_k109, sizeof(__pyx_k109)}, - {&__pyx_n_append, 1, __pyx_k43, sizeof(__pyx_k43)}, - {&__pyx_n_bind, 1, __pyx_k45, sizeof(__pyx_k45)}, - {&__pyx_n_callable, 1, __pyx_k49, sizeof(__pyx_k49)}, + {&__pyx_n___init__, 1, __pyx_k111, sizeof(__pyx_k111)}, + {&__pyx_n___jsinit__, 1, __pyx_k45, sizeof(__pyx_k45)}, + {&__pyx_n___jsname__, 1, __pyx_k54, sizeof(__pyx_k54)}, + {&__pyx_n___name__, 1, __pyx_k53, sizeof(__pyx_k53)}, + {&__pyx_n___repr__, 1, __pyx_k113, sizeof(__pyx_k113)}, + {&__pyx_n___str__, 1, __pyx_k112, sizeof(__pyx_k112)}, + {&__pyx_n_append, 1, __pyx_k44, sizeof(__pyx_k44)}, + {&__pyx_n_bind, 1, __pyx_k47, sizeof(__pyx_k47)}, + {&__pyx_n_callable, 1, __pyx_k51, sizeof(__pyx_k51)}, {&__pyx_n_execute, 1, __pyx_k35, sizeof(__pyx_k35)}, {&__pyx_n_format_exc, 1, __pyx_k4, sizeof(__pyx_k4)}, - {&__pyx_n_func_name, 1, __pyx_k66, sizeof(__pyx_k66)}, - {&__pyx_n_im_fun, 1, __pyx_k67, sizeof(__pyx_k67)}, + {&__pyx_n_func_name, 1, __pyx_k68, sizeof(__pyx_k68)}, + {&__pyx_n_im_fun, 1, __pyx_k69, sizeof(__pyx_k69)}, {&__pyx_n_inspect, 1, __pyx_k25, sizeof(__pyx_k25)}, {&__pyx_n_install_class, 1, __pyx_k21, sizeof(__pyx_k21)}, {&__pyx_n_isclass, 1, __pyx_k26, sizeof(__pyx_k26)}, - {&__pyx_n_iteritems, 1, __pyx_k86, sizeof(__pyx_k86)}, - {&__pyx_n_js_classname, 1, __pyx_k53, sizeof(__pyx_k53)}, - {&__pyx_n_js_is_array, 1, __pyx_k103, sizeof(__pyx_k103)}, - {&__pyx_n_js_is_bool, 1, __pyx_k101, sizeof(__pyx_k101)}, - {&__pyx_n_js_is_double, 1, __pyx_k102, sizeof(__pyx_k102)}, - {&__pyx_n_js_is_function, 1, __pyx_k104, sizeof(__pyx_k104)}, - {&__pyx_n_js_is_hash, 1, __pyx_k106, sizeof(__pyx_k106)}, - {&__pyx_n_js_is_int, 1, __pyx_k82, sizeof(__pyx_k82)}, - {&__pyx_n_js_is_object, 1, __pyx_k105, sizeof(__pyx_k105)}, - {&__pyx_n_js_is_string, 1, __pyx_k80, sizeof(__pyx_k80)}, - {&__pyx_n_js_is_void, 1, __pyx_k100, sizeof(__pyx_k100)}, - {&__pyx_n_mesg, 1, __pyx_k1, sizeof(__pyx_k1)}, - {&__pyx_n_object, 1, __pyx_k111, sizeof(__pyx_k111)}, + {&__pyx_n_iteritems, 1, __pyx_k88, sizeof(__pyx_k88)}, + {&__pyx_n_js_classname, 1, __pyx_k55, sizeof(__pyx_k55)}, + {&__pyx_n_js_is_array, 1, __pyx_k106, sizeof(__pyx_k106)}, + {&__pyx_n_js_is_bool, 1, __pyx_k104, sizeof(__pyx_k104)}, + {&__pyx_n_js_is_double, 1, __pyx_k105, sizeof(__pyx_k105)}, + {&__pyx_n_js_is_function, 1, __pyx_k107, sizeof(__pyx_k107)}, + {&__pyx_n_js_is_hash, 1, __pyx_k109, sizeof(__pyx_k109)}, + {&__pyx_n_js_is_int, 1, __pyx_k84, sizeof(__pyx_k84)}, + {&__pyx_n_js_is_object, 1, __pyx_k108, sizeof(__pyx_k108)}, + {&__pyx_n_js_is_string, 1, __pyx_k82, sizeof(__pyx_k82)}, + {&__pyx_n_js_is_void, 1, __pyx_k103, sizeof(__pyx_k103)}, + {&__pyx_n_mesg, 1, __pyx_k2, sizeof(__pyx_k2)}, + {&__pyx_n_object, 1, __pyx_k114, sizeof(__pyx_k114)}, {&__pyx_n_print_exc, 1, __pyx_k12, sizeof(__pyx_k12)}, - {&__pyx_n_py_is_array, 1, __pyx_k94, sizeof(__pyx_k94)}, - {&__pyx_n_py_is_bool, 1, __pyx_k90, sizeof(__pyx_k90)}, - {&__pyx_n_py_is_bound_method, 1, __pyx_k96, sizeof(__pyx_k96)}, - {&__pyx_n_py_is_double, 1, __pyx_k92, sizeof(__pyx_k92)}, - {&__pyx_n_py_is_function, 1, __pyx_k97, sizeof(__pyx_k97)}, - {&__pyx_n_py_is_hash, 1, __pyx_k95, sizeof(__pyx_k95)}, - {&__pyx_n_py_is_int, 1, __pyx_k91, sizeof(__pyx_k91)}, - {&__pyx_n_py_is_object, 1, __pyx_k98, sizeof(__pyx_k98)}, - {&__pyx_n_py_is_string, 1, __pyx_k93, sizeof(__pyx_k93)}, - {&__pyx_n_py_is_void, 1, __pyx_k89, sizeof(__pyx_k89)}, - {&__pyx_n_py_obj, 1, __pyx_k58, sizeof(__pyx_k58)}, + {&__pyx_n_py_is_array, 1, __pyx_k97, sizeof(__pyx_k97)}, + {&__pyx_n_py_is_bool, 1, __pyx_k93, sizeof(__pyx_k93)}, + {&__pyx_n_py_is_bound_method, 1, __pyx_k99, sizeof(__pyx_k99)}, + {&__pyx_n_py_is_double, 1, __pyx_k95, sizeof(__pyx_k95)}, + {&__pyx_n_py_is_function, 1, __pyx_k100, sizeof(__pyx_k100)}, + {&__pyx_n_py_is_hash, 1, __pyx_k98, sizeof(__pyx_k98)}, + {&__pyx_n_py_is_int, 1, __pyx_k94, sizeof(__pyx_k94)}, + {&__pyx_n_py_is_object, 1, __pyx_k101, sizeof(__pyx_k101)}, + {&__pyx_n_py_is_string, 1, __pyx_k96, sizeof(__pyx_k96)}, + {&__pyx_n_py_is_void, 1, __pyx_k92, sizeof(__pyx_k92)}, + {&__pyx_n_py_obj, 1, __pyx_k60, sizeof(__pyx_k60)}, {&__pyx_n_set_error, 1, __pyx_k10, sizeof(__pyx_k10)}, {&__pyx_n_stderr, 1, __pyx_k6, sizeof(__pyx_k6)}, {&__pyx_n_sys, 1, __pyx_k5, sizeof(__pyx_k5)}, {&__pyx_n_traceback, 1, __pyx_k3, sizeof(__pyx_k3)}, {&__pyx_n_types, 1, __pyx_k28, sizeof(__pyx_k28)}, + {&__pyx_n_unicode, 1, __pyx_k36, sizeof(__pyx_k36)}, {&__pyx_n_write, 1, __pyx_k7, sizeof(__pyx_k7)}, - {&__pyx_k2p, 0, __pyx_k2, sizeof(__pyx_k2)}, + {&__pyx_k1p, 0, __pyx_k1, sizeof(__pyx_k1)}, {&__pyx_k8p, 0, __pyx_k8, sizeof(__pyx_k8)}, {&__pyx_k11p, 0, __pyx_k11, sizeof(__pyx_k11)}, {&__pyx_k14p, 0, __pyx_k14, sizeof(__pyx_k14)}, @@ -522,36 +531,38 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_k24p, 0, __pyx_k24, sizeof(__pyx_k24)}, {&__pyx_k27p, 0, __pyx_k27, sizeof(__pyx_k27)}, {&__pyx_k31p, 0, __pyx_k31, sizeof(__pyx_k31)}, + {&__pyx_k32p, 0, __pyx_k32, sizeof(__pyx_k32)}, {&__pyx_k33p, 0, __pyx_k33, sizeof(__pyx_k33)}, {&__pyx_k34p, 0, __pyx_k34, sizeof(__pyx_k34)}, - {&__pyx_k36p, 0, __pyx_k36, sizeof(__pyx_k36)}, {&__pyx_k37p, 0, __pyx_k37, sizeof(__pyx_k37)}, {&__pyx_k38p, 0, __pyx_k38, sizeof(__pyx_k38)}, - {&__pyx_k40p, 0, __pyx_k40, sizeof(__pyx_k40)}, + {&__pyx_k39p, 0, __pyx_k39, sizeof(__pyx_k39)}, {&__pyx_k41p, 0, __pyx_k41, sizeof(__pyx_k41)}, {&__pyx_k42p, 0, __pyx_k42, sizeof(__pyx_k42)}, - {&__pyx_k48p, 0, __pyx_k48, sizeof(__pyx_k48)}, + {&__pyx_k43p, 0, __pyx_k43, sizeof(__pyx_k43)}, {&__pyx_k50p, 0, __pyx_k50, sizeof(__pyx_k50)}, - {&__pyx_k54p, 0, __pyx_k54, sizeof(__pyx_k54)}, - {&__pyx_k55p, 0, __pyx_k55, sizeof(__pyx_k55)}, + {&__pyx_k52p, 0, __pyx_k52, sizeof(__pyx_k52)}, {&__pyx_k56p, 0, __pyx_k56, sizeof(__pyx_k56)}, - {&__pyx_k59p, 0, __pyx_k59, sizeof(__pyx_k59)}, - {&__pyx_k60p, 0, __pyx_k60, sizeof(__pyx_k60)}, + {&__pyx_k57p, 0, __pyx_k57, sizeof(__pyx_k57)}, + {&__pyx_k58p, 0, __pyx_k58, sizeof(__pyx_k58)}, {&__pyx_k61p, 0, __pyx_k61, sizeof(__pyx_k61)}, {&__pyx_k62p, 0, __pyx_k62, sizeof(__pyx_k62)}, - {&__pyx_k68p, 0, __pyx_k68, sizeof(__pyx_k68)}, - {&__pyx_k71p, 0, __pyx_k71, sizeof(__pyx_k71)}, - {&__pyx_k72p, 0, __pyx_k72, sizeof(__pyx_k72)}, - {&__pyx_k75p, 0, __pyx_k75, sizeof(__pyx_k75)}, - {&__pyx_k78p, 0, __pyx_k78, sizeof(__pyx_k78)}, - {&__pyx_k79p, 0, __pyx_k79, sizeof(__pyx_k79)}, + {&__pyx_k63p, 0, __pyx_k63, sizeof(__pyx_k63)}, + {&__pyx_k64p, 0, __pyx_k64, sizeof(__pyx_k64)}, + {&__pyx_k70p, 0, __pyx_k70, sizeof(__pyx_k70)}, + {&__pyx_k73p, 0, __pyx_k73, sizeof(__pyx_k73)}, + {&__pyx_k74p, 0, __pyx_k74, sizeof(__pyx_k74)}, + {&__pyx_k77p, 0, __pyx_k77, sizeof(__pyx_k77)}, + {&__pyx_k80p, 0, __pyx_k80, sizeof(__pyx_k80)}, {&__pyx_k81p, 0, __pyx_k81, sizeof(__pyx_k81)}, {&__pyx_k83p, 0, __pyx_k83, sizeof(__pyx_k83)}, - {&__pyx_k84p, 0, __pyx_k84, sizeof(__pyx_k84)}, {&__pyx_k85p, 0, __pyx_k85, sizeof(__pyx_k85)}, + {&__pyx_k86p, 0, __pyx_k86, sizeof(__pyx_k86)}, {&__pyx_k87p, 0, __pyx_k87, sizeof(__pyx_k87)}, - {&__pyx_k99p, 0, __pyx_k99, sizeof(__pyx_k99)}, - {&__pyx_k107p, 0, __pyx_k107, sizeof(__pyx_k107)}, + {&__pyx_k89p, 0, __pyx_k89, sizeof(__pyx_k89)}, + {&__pyx_k90p, 0, __pyx_k90, sizeof(__pyx_k90)}, + {&__pyx_k102p, 0, __pyx_k102, sizeof(__pyx_k102)}, + {&__pyx_k110p, 0, __pyx_k110, sizeof(__pyx_k110)}, {0, 0, 0, 0} }; @@ -569,21 +580,21 @@ static void *__pyx_f_12spidermonkey_xmalloc(__pyx_t_12spidermonkey_size_t __pyx_ int __pyx_1; PyObject *__pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":375 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":383 */ __pyx_v_mem = malloc(__pyx_v_size); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":376 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":384 */ __pyx_1 = (((int)__pyx_v_mem) == 0); if (__pyx_1) { - __pyx_2 = PyObject_CallObject(PyExc_MemoryError, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 377; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(PyExc_MemoryError, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 385; goto __pyx_L1;} __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 377; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 385; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":378 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":386 */ __pyx_r = __pyx_v_mem; goto __pyx_L0; @@ -597,6 +608,106 @@ static void *__pyx_f_12spidermonkey_xmalloc(__pyx_t_12spidermonkey_size_t __pyx_ return __pyx_r; } +static struct JSString *__pyx_f_12spidermonkey_py2js_jsstring(struct JSContext *__pyx_v_cx,PyObject *__pyx_v_str) { + struct JSString *__pyx_v_ret; + struct JSString *__pyx_r; + Py_INCREF(__pyx_v_str); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":390 */ + __pyx_v_ret = py2js_jsstring_c(__pyx_v_cx,((struct PyObject *)__pyx_v_str)); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":391 */ + __pyx_r = __pyx_v_ret; + goto __pyx_L0; + + __pyx_r = 0; + __pyx_L0:; + Py_DECREF(__pyx_v_str); + return __pyx_r; +} + +static PyObject *__pyx_f_12spidermonkey_js2py_jsstring(struct JSString *__pyx_v_str) { + struct PyObject *__pyx_v_ret; + PyObject *__pyx_v_var; + PyObject *__pyx_r; + int __pyx_1; + PyObject *__pyx_2 = 0; + PyObject *__pyx_3 = 0; + __pyx_v_var = Py_None; Py_INCREF(Py_None); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":396 */ + __pyx_1 = (__pyx_v_str == NULL); + if (__pyx_1) { + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} + Py_INCREF(__pyx_k1p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k1p); + __pyx_3 = PyObject_CallObject(PyExc_TypeError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + __Pyx_Raise(__pyx_3, 0, 0); + Py_DECREF(__pyx_3); __pyx_3 = 0; + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} + goto __pyx_L2; + } + __pyx_L2:; + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":398 */ + __pyx_v_ret = js2py_jsstring_c(__pyx_v_str); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":399 */ + __pyx_1 = (__pyx_v_ret != NULL); + if (__pyx_1) { + Py_INCREF(((PyObject *)__pyx_v_ret)); + Py_DECREF(__pyx_v_var); + __pyx_v_var = ((PyObject *)__pyx_v_ret); + goto __pyx_L3; + } + __pyx_L3:; + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":401 */ + Py_INCREF(__pyx_v_var); + __pyx_r = __pyx_v_var; + goto __pyx_L0; + + __pyx_r = Py_None; Py_INCREF(Py_None); + goto __pyx_L0; + __pyx_L1:; + Py_XDECREF(__pyx_2); + Py_XDECREF(__pyx_3); + __Pyx_AddTraceback("spidermonkey.js2py_jsstring"); + __pyx_r = 0; + __pyx_L0:; + Py_DECREF(__pyx_v_var); + return __pyx_r; +} + +static PyObject *__pyx_f_12spidermonkey_test_utf_16_round_trip(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyObject *__pyx_f_12spidermonkey_test_utf_16_round_trip(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + struct __pyx_obj_12spidermonkey_Context *__pyx_v_cx = 0; + PyObject *__pyx_v_data = 0; + PyObject *__pyx_r; + PyObject *__pyx_1 = 0; + static char *__pyx_argnames[] = {"cx","data",0}; + if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_cx, &__pyx_v_data)) return 0; + Py_INCREF(__pyx_v_cx); + Py_INCREF(__pyx_v_data); + if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_cx), __pyx_ptype_12spidermonkey_Context, 1, "cx")) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 415; goto __pyx_L1;} + __pyx_1 = __pyx_f_12spidermonkey_js2py_jsstring(__pyx_f_12spidermonkey_py2js_jsstring(__pyx_v_cx->cx,__pyx_v_data)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 416; goto __pyx_L1;} + __pyx_r = __pyx_1; + __pyx_1 = 0; + goto __pyx_L0; + + __pyx_r = Py_None; Py_INCREF(Py_None); + goto __pyx_L0; + __pyx_L1:; + Py_XDECREF(__pyx_1); + __Pyx_AddTraceback("spidermonkey.test_utf_16_round_trip"); + __pyx_r = 0; + __pyx_L0:; + Py_DECREF(__pyx_v_cx); + Py_DECREF(__pyx_v_data); + return __pyx_r; +} + static PyObject *__pyx_f_12spidermonkey_7JSError___init__(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static PyMethodDef __pyx_mdef_12spidermonkey_7JSError___init__ = {"__init__", (PyCFunction)__pyx_f_12spidermonkey_7JSError___init__, METH_VARARGS|METH_KEYWORDS, 0}; static PyObject *__pyx_f_12spidermonkey_7JSError___init__(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { @@ -607,7 +718,7 @@ static PyObject *__pyx_f_12spidermonkey_7JSError___init__(PyObject *__pyx_self, if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_self, &__pyx_v_mesg)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_mesg); - if (PyObject_SetAttr(__pyx_v_self, __pyx_n_mesg, __pyx_v_mesg) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_v_self, __pyx_n_mesg, __pyx_v_mesg) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 425; goto __pyx_L1;} __pyx_r = Py_None; Py_INCREF(Py_None); goto __pyx_L0; @@ -629,7 +740,7 @@ static PyObject *__pyx_f_12spidermonkey_7JSError___str__(PyObject *__pyx_self, P static char *__pyx_argnames[] = {"self",0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_self)) return 0; Py_INCREF(__pyx_v_self); - __pyx_1 = PyObject_Repr(__pyx_v_self); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 401; goto __pyx_L1;} + __pyx_1 = PyObject_Repr(__pyx_v_self); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -651,22 +762,18 @@ static PyObject *__pyx_f_12spidermonkey_7JSError___repr__(PyObject *__pyx_self, PyObject *__pyx_v_self = 0; PyObject *__pyx_r; PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; static char *__pyx_argnames[] = {"self",0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_self)) return 0; Py_INCREF(__pyx_v_self); - __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_mesg); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 403; goto __pyx_L1;} - __pyx_2 = PyNumber_Remainder(__pyx_k2p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 403; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_r = __pyx_2; - __pyx_2 = 0; + __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_mesg); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 429; goto __pyx_L1;} + __pyx_r = __pyx_1; + __pyx_1 = 0; goto __pyx_L0; __pyx_r = Py_None; Py_INCREF(Py_None); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_2); __Pyx_AddTraceback("spidermonkey.JSError.__repr__"); __pyx_r = 0; __pyx_L0:; @@ -1510,14 +1617,15 @@ static PyObject *__pyx_f_12spidermonkey_7Context_bind(PyObject *__pyx_v_self, Py PyObject *__pyx_v_obj = 0; struct __pyx_obj_12spidermonkey_ClassAdapter *__pyx_v_ca; __pyx_t_12spidermonkey_jsval __pyx_v_jsv; + struct JSString *__pyx_v_converted; + __pyx_t_12spidermonkey_jschar *__pyx_v_data; + __pyx_t_12spidermonkey_size_t __pyx_v_length; PyObject *__pyx_r; - PyObject *__pyx_1 = 0; + int __pyx_1; PyObject *__pyx_2 = 0; - int __pyx_3; - int __pyx_4; - PyObject *__pyx_5 = 0; - __pyx_t_12spidermonkey_jsval __pyx_6; - char *__pyx_7; + PyObject *__pyx_3 = 0; + PyObject *__pyx_4 = 0; + __pyx_t_12spidermonkey_jsval __pyx_5; static char *__pyx_argnames[] = {"name","obj",0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_name, &__pyx_v_obj)) return 0; Py_INCREF(__pyx_v_self); @@ -1525,58 +1633,61 @@ static PyObject *__pyx_f_12spidermonkey_7Context_bind(PyObject *__pyx_v_self, Py Py_INCREF(__pyx_v_obj); __pyx_v_ca = ((struct __pyx_obj_12spidermonkey_ClassAdapter *)Py_None); Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":87 */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 87; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_StringTypes); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 87; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PyObject_IsInstance(__pyx_v_name,__pyx_2); if (__pyx_3 == -1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 87; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = (!__pyx_3); - if (__pyx_4) { - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 88; goto __pyx_L1;} - Py_INCREF(__pyx_k33p); - PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k33p); - __pyx_2 = PyObject_CallObject(PyExc_TypeError, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 88; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __Pyx_Raise(__pyx_2, 0, 0); + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":90 */ + __pyx_v_converted = __pyx_f_12spidermonkey_py2js_jsstring(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,__pyx_v_name); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":91 */ + __pyx_1 = (__pyx_v_converted == NULL); + if (__pyx_1) { + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 92; goto __pyx_L1;} + Py_INCREF(__pyx_k32p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k32p); + __pyx_3 = PyObject_CallObject(PyExc_TypeError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 92; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 88; goto __pyx_L1;} + __Pyx_Raise(__pyx_3, 0, 0); + Py_DECREF(__pyx_3); __pyx_3 = 0; + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 92; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":90 */ - __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_install_class); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 90; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_v_obj, __pyx_n___class__); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 90; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 90; goto __pyx_L1;} - PyTuple_SET_ITEM(__pyx_5, 0, __pyx_2); - __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 90; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_5); __pyx_5 = 0; - if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_ClassAdapter)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 90; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":94 */ + __pyx_v_data = JS_GetStringChars(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":95 */ + __pyx_v_length = JS_GetStringLength(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":97 */ + __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_install_class); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_obj, __pyx_n___class__); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); + __pyx_3 = 0; + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_4); __pyx_4 = 0; + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_12spidermonkey_ClassAdapter)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_ca)); - __pyx_v_ca = ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_2); - __pyx_2 = 0; + __pyx_v_ca = ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_3); + __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":91 */ - __pyx_6 = __pyx_f_12spidermonkey_py2js(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self),__pyx_v_obj,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj); if (__pyx_6 == 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 91; goto __pyx_L1;} - __pyx_v_jsv = __pyx_6; + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":98 */ + __pyx_5 = __pyx_f_12spidermonkey_py2js(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self),__pyx_v_obj,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 98; goto __pyx_L1;} + __pyx_v_jsv = __pyx_5; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":92 */ - __pyx_7 = PyString_AsString(__pyx_v_name); if (!__pyx_7) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 92; goto __pyx_L1;} - __pyx_3 = (!JS_DefineProperty(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj,__pyx_7,__pyx_v_jsv,__pyx_f_12spidermonkey___get_property_callback__,__pyx_f_12spidermonkey___set_property_callback__,0)); - if (__pyx_3) { - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 94; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 94; goto __pyx_L1;} - Py_INCREF(__pyx_k34p); - PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k34p); - __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 94; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_5); __pyx_5 = 0; - __Pyx_Raise(__pyx_2, 0, 0); + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":99 */ + __pyx_1 = (!JS_DefineUCProperty(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj,__pyx_v_data,__pyx_v_length,__pyx_v_jsv,__pyx_f_12spidermonkey___get_property_callback__,__pyx_f_12spidermonkey___set_property_callback__,0)); + if (__pyx_1) { + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 101; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 101; goto __pyx_L1;} + Py_INCREF(__pyx_k33p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k33p); + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 101; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 94; goto __pyx_L1;} + Py_DECREF(__pyx_4); __pyx_4 = 0; + __Pyx_Raise(__pyx_3, 0, 0); + Py_DECREF(__pyx_3); __pyx_3 = 0; + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 101; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; @@ -1584,9 +1695,9 @@ static PyObject *__pyx_f_12spidermonkey_7Context_bind(PyObject *__pyx_v_self, Py __pyx_r = Py_None; Py_INCREF(Py_None); goto __pyx_L0; __pyx_L1:; - Py_XDECREF(__pyx_1); Py_XDECREF(__pyx_2); - Py_XDECREF(__pyx_5); + Py_XDECREF(__pyx_3); + Py_XDECREF(__pyx_4); __Pyx_AddTraceback("spidermonkey.Context.bind"); __pyx_r = 0; __pyx_L0:; @@ -1600,52 +1711,87 @@ static PyObject *__pyx_f_12spidermonkey_7Context_bind(PyObject *__pyx_v_self, Py static PyObject *__pyx_f_12spidermonkey_7Context_unbind(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static PyObject *__pyx_f_12spidermonkey_7Context_unbind(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_name = 0; + __pyx_t_12spidermonkey_jsval __pyx_v_rval; + struct JSString *__pyx_v_converted; + __pyx_t_12spidermonkey_jschar *__pyx_v_data; + __pyx_t_12spidermonkey_size_t __pyx_v_length; PyObject *__pyx_v_ret; PyObject *__pyx_r; - PyObject *__pyx_1 = 0; + int __pyx_1; PyObject *__pyx_2 = 0; PyObject *__pyx_3 = 0; - char *__pyx_4; - int __pyx_5; + PyObject *__pyx_4 = 0; + PyObject *__pyx_5 = 0; static char *__pyx_argnames[] = {"name",0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_name)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_name); __pyx_v_ret = Py_None; Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":97 */ - __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_execute); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} - __pyx_2 = PyNumber_Remainder(__pyx_k36p, __pyx_v_name); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); - __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 97; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_v_ret); - __pyx_v_ret = __pyx_2; - __pyx_2 = 0; + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":109 */ + __pyx_v_converted = __pyx_f_12spidermonkey_py2js_jsstring(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,__pyx_v_name); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":98 */ - __pyx_4 = PyString_AsString(__pyx_v_name); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 98; goto __pyx_L1;} - __pyx_5 = (!JS_DeleteProperty(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj,__pyx_4)); - if (__pyx_5) { - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 99; goto __pyx_L1;} - __pyx_3 = PyNumber_Remainder(__pyx_k37p, __pyx_v_name); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 99; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 99; goto __pyx_L1;} - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3); - __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 99; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":110 */ + __pyx_1 = (__pyx_v_converted == NULL); + if (__pyx_1) { + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 111; goto __pyx_L1;} + Py_INCREF(__pyx_k34p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k34p); + __pyx_3 = PyObject_CallObject(PyExc_TypeError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 111; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 99; goto __pyx_L1;} + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 111; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":100 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":113 */ + __pyx_v_data = JS_GetStringChars(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":114 */ + __pyx_v_length = JS_GetStringLength(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":116 */ + __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_execute); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_unicode); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + Py_INCREF(__pyx_k37p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k37p); + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_4); __pyx_4 = 0; + __pyx_3 = PyNumber_Add(__pyx_v_name, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + Py_DECREF(__pyx_5); __pyx_5 = 0; + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); + __pyx_3 = 0; + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 116; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_4); __pyx_4 = 0; + Py_DECREF(__pyx_v_ret); + __pyx_v_ret = __pyx_5; + __pyx_5 = 0; + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":117 */ + __pyx_1 = (!JS_DeleteUCProperty2(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj,__pyx_v_data,__pyx_v_length,(&__pyx_v_rval))); + if (__pyx_1) { + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 118; goto __pyx_L1;} + __pyx_2 = PyNumber_Remainder(__pyx_k38p, __pyx_v_name); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 118; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 118; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2); + __pyx_2 = 0; + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 118; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_4); __pyx_4 = 0; + __Pyx_Raise(__pyx_5, 0, 0); + Py_DECREF(__pyx_5); __pyx_5 = 0; + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 118; goto __pyx_L1;} + goto __pyx_L3; + } + __pyx_L3:; + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":121 */ Py_INCREF(__pyx_v_ret); __pyx_r = __pyx_v_ret; goto __pyx_L0; @@ -1653,9 +1799,10 @@ static PyObject *__pyx_f_12spidermonkey_7Context_unbind(PyObject *__pyx_v_self, __pyx_r = Py_None; Py_INCREF(Py_None); goto __pyx_L0; __pyx_L1:; - Py_XDECREF(__pyx_1); Py_XDECREF(__pyx_2); Py_XDECREF(__pyx_3); + Py_XDECREF(__pyx_4); + Py_XDECREF(__pyx_5); __Pyx_AddTraceback("spidermonkey.Context.unbind"); __pyx_r = 0; __pyx_L0:; @@ -1670,83 +1817,85 @@ static char __pyx_doc_12spidermonkey_7Context_execute[] = " Execute JavaS static PyObject *__pyx_f_12spidermonkey_7Context_execute(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v_script = 0; __pyx_t_12spidermonkey_jsval __pyx_v_rval; + struct JSString *__pyx_v_converted; + __pyx_t_12spidermonkey_jschar *__pyx_v_data; + __pyx_t_12spidermonkey_size_t __pyx_v_length; PyObject *__pyx_r; - PyObject *__pyx_1 = 0; + int __pyx_1; PyObject *__pyx_2 = 0; - int __pyx_3; - int __pyx_4; - char *__pyx_5; - Py_ssize_t __pyx_6; - PyObject *__pyx_7 = 0; + PyObject *__pyx_3 = 0; + PyObject *__pyx_4 = 0; static char *__pyx_argnames[] = {"script",0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_script)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_script); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":107 */ - /*try:*/ { + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":132 */ + __pyx_v_converted = __pyx_f_12spidermonkey_py2js_jsstring(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,__pyx_v_script); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":108 */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 108; goto __pyx_L3;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_StringTypes); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 108; goto __pyx_L3;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PyObject_IsInstance(__pyx_v_script,__pyx_2); if (__pyx_3 == -1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 108; goto __pyx_L3;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":133 */ + __pyx_1 = (__pyx_v_converted == NULL); + if (__pyx_1) { + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 134; goto __pyx_L1;} + Py_INCREF(__pyx_k39p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k39p); + __pyx_3 = PyObject_CallObject(PyExc_TypeError, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 134; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = (!__pyx_3); - if (__pyx_4) { - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 109; goto __pyx_L3;} - Py_INCREF(__pyx_k38p); - PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k38p); - __pyx_2 = PyObject_CallObject(PyExc_TypeError, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 109; goto __pyx_L3;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __Pyx_Raise(__pyx_2, 0, 0); - Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 109; goto __pyx_L3;} - goto __pyx_L5; - } - __pyx_L5:; + __Pyx_Raise(__pyx_3, 0, 0); + Py_DECREF(__pyx_3); __pyx_3 = 0; + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 134; goto __pyx_L1;} + goto __pyx_L2; + } + __pyx_L2:; + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":136 */ + __pyx_v_data = JS_GetStringChars(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":137 */ + __pyx_v_length = JS_GetStringLength(__pyx_v_converted); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":111 */ - __pyx_5 = PyString_AsString(__pyx_v_script); if (!__pyx_5) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 111; goto __pyx_L3;} - __pyx_6 = PyObject_Length(__pyx_v_script); if (__pyx_6 == -1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 111; goto __pyx_L3;} - __pyx_3 = (!JS_EvaluateScript(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj,__pyx_5,__pyx_6,__pyx_k39,0,(&__pyx_v_rval))); - if (__pyx_3) { - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 112; goto __pyx_L3;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 112; goto __pyx_L3;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":139 */ + /*try:*/ { + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":140 */ + __pyx_1 = (!JS_EvaluateUCScript(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->cx,((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->root->js_obj,__pyx_v_data,__pyx_v_length,__pyx_k40,0,(&__pyx_v_rval))); + if (__pyx_1) { + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 141; goto __pyx_L4;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 141; goto __pyx_L4;} Py_INCREF(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->error); - PyTuple_SET_ITEM(__pyx_2, 0, ((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->error); - __pyx_7 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_7) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 112; goto __pyx_L3;} - Py_DECREF(__pyx_1); __pyx_1 = 0; + PyTuple_SET_ITEM(__pyx_3, 0, ((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->error); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 141; goto __pyx_L4;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __Pyx_Raise(__pyx_7, 0, 0); - Py_DECREF(__pyx_7); __pyx_7 = 0; - {__pyx_filename = __pyx_f[4]; __pyx_lineno = 112; goto __pyx_L3;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __Pyx_Raise(__pyx_4, 0, 0); + Py_DECREF(__pyx_4); __pyx_4 = 0; + {__pyx_filename = __pyx_f[4]; __pyx_lineno = 141; goto __pyx_L4;} goto __pyx_L6; } __pyx_L6:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":114 */ - __pyx_1 = __pyx_f_12spidermonkey_js2py(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self),__pyx_v_rval); if (!__pyx_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 114; goto __pyx_L3;} - __pyx_r = __pyx_1; - __pyx_1 = 0; - goto __pyx_L2; + /* "/usr/local/src/python-spidermonkey/spidermonkey/jscontext.pxi":142 */ + __pyx_2 = __pyx_f_12spidermonkey_js2py(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self),__pyx_v_rval); if (!__pyx_2) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 142; goto __pyx_L4;} + __pyx_r = __pyx_2; + __pyx_2 = 0; + goto __pyx_L3; } /*finally:*/ { int __pyx_why; PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb; int __pyx_exc_lineno; - __pyx_why = 0; goto __pyx_L4; - __pyx_L2: __pyx_why = 3; goto __pyx_L4; - __pyx_L3: { + __pyx_why = 0; goto __pyx_L5; + __pyx_L3: __pyx_why = 3; goto __pyx_L5; + __pyx_L4: { __pyx_why = 4; + Py_XDECREF(__pyx_3); __pyx_3 = 0; + Py_XDECREF(__pyx_4); __pyx_4 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; - Py_XDECREF(__pyx_7); __pyx_7 = 0; - Py_XDECREF(__pyx_1); __pyx_1 = 0; PyErr_Fetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb); __pyx_exc_lineno = __pyx_lineno; - goto __pyx_L4; + goto __pyx_L5; } - __pyx_L4:; + __pyx_L5:; ((struct __pyx_vtabstruct_12spidermonkey_GC *)((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->gc->__pyx_vtab)->run_maybe(((struct __pyx_obj_12spidermonkey_Context *)__pyx_v_self)->gc); switch (__pyx_why) { case 3: goto __pyx_L0; @@ -1764,9 +1913,9 @@ static PyObject *__pyx_f_12spidermonkey_7Context_execute(PyObject *__pyx_v_self, __pyx_r = Py_None; Py_INCREF(Py_None); goto __pyx_L0; __pyx_L1:; - Py_XDECREF(__pyx_1); Py_XDECREF(__pyx_2); - Py_XDECREF(__pyx_7); + Py_XDECREF(__pyx_3); + Py_XDECREF(__pyx_4); __Pyx_AddTraceback("spidermonkey.Context.execute"); __pyx_r = 0; __pyx_L0:; @@ -1823,8 +1972,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___constructor_callba if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 11; goto __pyx_L2;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 11; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 11; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -1843,8 +1992,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___constructor_callba if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 15; goto __pyx_L2;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 15; goto __pyx_L2;} - Py_INCREF(__pyx_k41p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); + Py_INCREF(__pyx_k42p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k42p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 15; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -1860,8 +2009,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___constructor_callba if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; goto __pyx_L2;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; goto __pyx_L2;} - Py_INCREF(__pyx_k42p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k42p); + Py_INCREF(__pyx_k43p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k43p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -1906,7 +2055,15 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___constructor_callba } /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":27 */ - __pyx_1 = PyObject_HasAttr(__pyx_v_adapter->py_class,__pyx_n___jsinit__); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 27; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_unicode); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 27; goto __pyx_L2;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 27; goto __pyx_L2;} + Py_INCREF(__pyx_n___jsinit__); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_n___jsinit__); + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 27; goto __pyx_L2;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_4); __pyx_4 = 0; + __pyx_1 = PyObject_HasAttr(__pyx_v_adapter->py_class,__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 27; goto __pyx_L2;} + Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { __pyx_2 = PyObject_GetAttr(__pyx_v_adapter->py_class, __pyx_n___jsinit__); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; goto __pyx_L2;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 28; goto __pyx_L2;} @@ -2037,8 +2194,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___resolve_global_cal if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 54; goto __pyx_L2;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 54; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 54; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -2087,7 +2244,7 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___resolve_global_cal /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":65 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; goto __pyx_L2;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_StringTypes); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; goto __pyx_L2;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_UnicodeType); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -2095,14 +2252,14 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___resolve_global_cal __pyx_1 = PyObject_HasAttr(__pyx_v_py_obj,__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; goto __pyx_L2;} } if (__pyx_1) { - __pyx_4 = PyObject_GetAttr(((PyObject *)__pyx_v_pycx), __pyx_n_bind); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 68; goto __pyx_L2;} - __pyx_2 = PyObject_GetAttr(__pyx_v_py_obj,__pyx_v_key); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 68; goto __pyx_L2;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 68; goto __pyx_L2;} + __pyx_4 = PyObject_GetAttr(((PyObject *)__pyx_v_pycx), __pyx_n_bind); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; goto __pyx_L2;} + __pyx_2 = PyObject_GetAttr(__pyx_v_py_obj,__pyx_v_key); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; goto __pyx_L2;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; goto __pyx_L2;} Py_INCREF(__pyx_v_key); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_key); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 68; goto __pyx_L2;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; goto __pyx_L2;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -2110,7 +2267,7 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___resolve_global_cal } __pyx_L6:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":70 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":68 */ __pyx_r = JS_TRUE; goto __pyx_L0; } @@ -2120,20 +2277,20 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___resolve_global_cal Py_XDECREF(__pyx_3); __pyx_3 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":71 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":69 */ /*except:*/ { __Pyx_AddTraceback("spidermonkey.__resolve_global_callback__"); - if (__Pyx_GetException(&__pyx_4, &__pyx_3, &__pyx_2) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 71; goto __pyx_L1;} + if (__Pyx_GetException(&__pyx_4, &__pyx_3, &__pyx_2) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 69; goto __pyx_L1;} - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":72 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_traceback); if (!__pyx_5) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 72; goto __pyx_L1;} - __pyx_6 = PyObject_GetAttr(__pyx_5, __pyx_n_print_exc); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 72; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":70 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_traceback); if (!__pyx_5) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; goto __pyx_L1;} + __pyx_6 = PyObject_GetAttr(__pyx_5, __pyx_n_print_exc); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_6, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 72; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_6, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":73 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":71 */ __pyx_r = __pyx_f_12spidermonkey_report_python_error(__pyx_v_cx); Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -2184,40 +2341,40 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___get_property_callb __pyx_v_key = Py_None; Py_INCREF(Py_None); __pyx_v_attr = Py_None; Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":82 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":81 */ /*try:*/ { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":83 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":82 */ __pyx_1 = (!js_context_has_data(__pyx_v_cx)); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; goto __pyx_L2;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 83; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 83; goto __pyx_L2;} + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 83; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; goto __pyx_L2;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 83; goto __pyx_L2;} goto __pyx_L4; } __pyx_L4:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":86 */ - __pyx_2 = js_context_fetch(__pyx_v_cx); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 86; goto __pyx_L2;} - if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_Context)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 86; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":85 */ + __pyx_2 = js_context_fetch(__pyx_v_cx); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 85; goto __pyx_L2;} + if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_Context)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 85; goto __pyx_L2;} Py_DECREF(((PyObject *)__pyx_v_pycx)); __pyx_v_pycx = ((struct __pyx_obj_12spidermonkey_Context *)__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":87 */ - __pyx_3 = __pyx_f_12spidermonkey_js2py(__pyx_v_pycx,__pyx_v_jsv); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 87; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":86 */ + __pyx_3 = __pyx_f_12spidermonkey_js2py(__pyx_v_pycx,__pyx_v_jsv); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 86; goto __pyx_L2;} Py_DECREF(__pyx_v_key); __pyx_v_key = __pyx_3; __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":89 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":88 */ __pyx_1 = (!js_object_has_data(__pyx_v_cx,__pyx_v_js_obj)); if (__pyx_1) { __pyx_r = JS_TRUE; @@ -2226,41 +2383,41 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___get_property_callb } __pyx_L5:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":92 */ - __pyx_4 = js_object_fetch(__pyx_v_cx,__pyx_v_js_obj); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 92; goto __pyx_L2;} - if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_12spidermonkey_ObjectAdapter)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 92; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":91 */ + __pyx_4 = js_object_fetch(__pyx_v_cx,__pyx_v_js_obj); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 91; goto __pyx_L2;} + if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_12spidermonkey_ObjectAdapter)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 91; goto __pyx_L2;} Py_DECREF(((PyObject *)__pyx_v_adapter)); __pyx_v_adapter = ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)__pyx_4); __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":93 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":92 */ Py_INCREF(__pyx_v_adapter->py_obj); Py_DECREF(__pyx_v_py_obj); __pyx_v_py_obj = __pyx_v_adapter->py_obj; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":95 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; goto __pyx_L2;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_IntType); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":94 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; goto __pyx_L2;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_IntType); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; goto __pyx_L2;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_LongType); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; goto __pyx_L2;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; goto __pyx_L2;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_LongType); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; goto __pyx_L2;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; goto __pyx_L2;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; goto __pyx_L2;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2); __pyx_3 = 0; __pyx_2 = 0; - __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_4); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; goto __pyx_L2;} + __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_4); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 94; goto __pyx_L2;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { /*try:*/ { - __pyx_3 = PyObject_GetItem(__pyx_v_py_obj, __pyx_v_key); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 97; goto __pyx_L7;} + __pyx_3 = PyObject_GetItem(__pyx_v_py_obj, __pyx_v_key); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 96; goto __pyx_L7;} Py_DECREF(__pyx_v_attr); __pyx_v_attr = __pyx_3; __pyx_3 = 0; } /*else:*/ { - __pyx_5 = __pyx_f_12spidermonkey_py2js(__pyx_v_pycx,__pyx_v_attr,NULL); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 101; goto __pyx_L2;} + __pyx_5 = __pyx_f_12spidermonkey_py2js(__pyx_v_pycx,__pyx_v_attr,NULL); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 100; goto __pyx_L2;} (__pyx_v_rval[0]) = __pyx_5; } goto __pyx_L8; @@ -2269,10 +2426,10 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___get_property_callb Py_XDECREF(__pyx_4); __pyx_4 = 0; Py_XDECREF(__pyx_3); __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":98 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":97 */ /*except:*/ { __Pyx_AddTraceback("spidermonkey.__get_property_callback__"); - if (__Pyx_GetException(&__pyx_2, &__pyx_4, &__pyx_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 98; goto __pyx_L2;} + if (__Pyx_GetException(&__pyx_2, &__pyx_4, &__pyx_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 97; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -2281,40 +2438,49 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___get_property_callb __pyx_L8:; goto __pyx_L6; } - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_StringTypes); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 101; goto __pyx_L2;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_UnicodeType); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 101; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_4); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} + __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_4); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 101; goto __pyx_L2;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - __pyx_3 = PySequence_GetSlice(__pyx_v_key, 0, 1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 103; goto __pyx_L2;} - if (PyObject_Cmp(__pyx_3, __pyx_n__, &__pyx_1) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 103; goto __pyx_L2;} + __pyx_3 = PySequence_GetSlice(__pyx_v_key, 0, 1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_unicode); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} + Py_INCREF(__pyx_n__); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_n__); + __pyx_6 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_4); __pyx_4 = 0; + if (PyObject_Cmp(__pyx_3, __pyx_6, &__pyx_1) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 102; goto __pyx_L2;} __pyx_1 = __pyx_1 != 0; Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_6); __pyx_6 = 0; if (__pyx_1) { /*try:*/ { - __pyx_2 = PyObject_GetAttr(__pyx_v_py_obj,__pyx_v_key); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 105; goto __pyx_L10;} + __pyx_2 = PyObject_GetAttr(__pyx_v_py_obj,__pyx_v_key); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 104; goto __pyx_L10;} Py_DECREF(__pyx_v_attr); __pyx_v_attr = __pyx_2; __pyx_2 = 0; } /*else:*/ { - __pyx_5 = __pyx_f_12spidermonkey_py2js(__pyx_v_pycx,__pyx_v_attr,__pyx_v_js_obj); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 109; goto __pyx_L2;} + __pyx_5 = __pyx_f_12spidermonkey_py2js(__pyx_v_pycx,__pyx_v_attr,__pyx_v_js_obj); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 108; goto __pyx_L2;} (__pyx_v_rval[0]) = __pyx_5; } goto __pyx_L11; __pyx_L10:; Py_XDECREF(__pyx_4); __pyx_4 = 0; Py_XDECREF(__pyx_3); __pyx_3 = 0; + Py_XDECREF(__pyx_6); __pyx_6 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":106 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":105 */ /*except:*/ { __Pyx_AddTraceback("spidermonkey.__get_property_callback__"); - if (__Pyx_GetException(&__pyx_4, &__pyx_3, &__pyx_2) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 106; goto __pyx_L2;} + if (__Pyx_GetException(&__pyx_4, &__pyx_3, &__pyx_6) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 105; goto __pyx_L2;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_6); __pyx_6 = 0; goto __pyx_L11; } __pyx_L11:; @@ -2325,57 +2491,58 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___get_property_callb } __pyx_1 = __pyx_v_key == Py_None; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_JS_VOID); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 111; goto __pyx_L2;} - __pyx_5 = PyInt_AsLong(__pyx_4); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 111; goto __pyx_L2;} - Py_DECREF(__pyx_4); __pyx_4 = 0; + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_JS_VOID); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 110; goto __pyx_L2;} + __pyx_5 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 110; goto __pyx_L2;} + Py_DECREF(__pyx_2); __pyx_2 = 0; (__pyx_v_rval[0]) = __pyx_5; goto __pyx_L6; } /*else*/ { - __pyx_3 = PyNumber_Remainder(__pyx_k48p, __pyx_v_key); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; goto __pyx_L2;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; goto __pyx_L2;} - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3); - __pyx_3 = 0; - __pyx_4 = PyObject_CallObject(PyExc_AssertionError, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; goto __pyx_L2;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - __Pyx_Raise(__pyx_4, 0, 0); - Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; goto __pyx_L2;} + __pyx_4 = PyNumber_Remainder(__pyx_k50p, __pyx_v_key); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 112; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 112; goto __pyx_L2;} + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); + __pyx_4 = 0; + __pyx_6 = PyObject_CallObject(PyExc_AssertionError, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 112; goto __pyx_L2;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __Pyx_Raise(__pyx_6, 0, 0); + Py_DECREF(__pyx_6); __pyx_6 = 0; + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 112; goto __pyx_L2;} } __pyx_L6:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":115 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":114 */ __pyx_r = JS_TRUE; goto __pyx_L0; } goto __pyx_L3; __pyx_L2:; - Py_XDECREF(__pyx_3); __pyx_3 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; Py_XDECREF(__pyx_4); __pyx_4 = 0; + Py_XDECREF(__pyx_3); __pyx_3 = 0; + Py_XDECREF(__pyx_6); __pyx_6 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":116 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":115 */ /*except:*/ { __Pyx_AddTraceback("spidermonkey.__get_property_callback__"); - if (__Pyx_GetException(&__pyx_3, &__pyx_2, &__pyx_4) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 116; goto __pyx_L1;} + if (__Pyx_GetException(&__pyx_2, &__pyx_4, &__pyx_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 115; goto __pyx_L1;} - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":117 */ - __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n_traceback); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 117; goto __pyx_L1;} - __pyx_7 = PyObject_GetAttr(__pyx_6, __pyx_n_print_exc); if (!__pyx_7) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 117; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":116 */ + __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n_traceback); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 116; goto __pyx_L1;} + __pyx_7 = PyObject_GetAttr(__pyx_6, __pyx_n_print_exc); if (!__pyx_7) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 116; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_6 = PyObject_CallObject(__pyx_7, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 117; goto __pyx_L1;} + __pyx_6 = PyObject_CallObject(__pyx_7, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 116; goto __pyx_L1;} Py_DECREF(__pyx_7); __pyx_7 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":118 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":117 */ __pyx_r = __pyx_f_12spidermonkey_report_python_error(__pyx_v_cx); Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; goto __pyx_L0; - Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; goto __pyx_L3; } __pyx_L3:; @@ -2411,9 +2578,9 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___set_property_callb PyObject *__pyx_2 = 0; PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; - int __pyx_5; + PyObject *__pyx_5 = 0; int __pyx_6; - PyObject *__pyx_7 = 0; + int __pyx_7; PyObject *__pyx_8 = 0; __pyx_v_pycx = ((struct __pyx_obj_12spidermonkey_Context *)Py_None); Py_INCREF(Py_None); __pyx_v_adapter = ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)Py_None); Py_INCREF(Py_None); @@ -2422,46 +2589,46 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___set_property_callb __pyx_v_value = Py_None; Py_INCREF(Py_None); __pyx_v_attr = Py_None; Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":127 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":126 */ /*try:*/ { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":128 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":127 */ __pyx_1 = (!js_context_has_data(__pyx_v_cx)); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 129; goto __pyx_L2;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 129; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 129; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 128; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 128; goto __pyx_L2;} + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 128; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 129; goto __pyx_L2;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 128; goto __pyx_L2;} goto __pyx_L4; } __pyx_L4:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":131 */ - __pyx_2 = js_context_fetch(__pyx_v_cx); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 131; goto __pyx_L2;} - if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_Context)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 131; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":130 */ + __pyx_2 = js_context_fetch(__pyx_v_cx); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 130; goto __pyx_L2;} + if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_Context)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 130; goto __pyx_L2;} Py_DECREF(((PyObject *)__pyx_v_pycx)); __pyx_v_pycx = ((struct __pyx_obj_12spidermonkey_Context *)__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":132 */ - __pyx_3 = __pyx_f_12spidermonkey_js2py(__pyx_v_pycx,__pyx_v_jsv); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 132; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":131 */ + __pyx_3 = __pyx_f_12spidermonkey_js2py(__pyx_v_pycx,__pyx_v_jsv); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 131; goto __pyx_L2;} Py_DECREF(__pyx_v_key); __pyx_v_key = __pyx_3; __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":133 */ - __pyx_4 = __pyx_f_12spidermonkey_js2py(__pyx_v_pycx,(__pyx_v_rval[0])); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 133; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":132 */ + __pyx_4 = __pyx_f_12spidermonkey_js2py(__pyx_v_pycx,(__pyx_v_rval[0])); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 132; goto __pyx_L2;} Py_DECREF(__pyx_v_value); __pyx_v_value = __pyx_4; __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":135 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":134 */ __pyx_1 = (!js_object_has_data(__pyx_v_cx,__pyx_v_js_obj)); if (__pyx_1) { __pyx_r = JS_TRUE; @@ -2470,70 +2637,78 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___set_property_callb } __pyx_L5:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":138 */ - __pyx_2 = js_object_fetch(__pyx_v_cx,__pyx_v_js_obj); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 138; goto __pyx_L2;} - if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_ObjectAdapter)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 138; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":137 */ + __pyx_2 = js_object_fetch(__pyx_v_cx,__pyx_v_js_obj); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 137; goto __pyx_L2;} + if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_ObjectAdapter)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 137; goto __pyx_L2;} Py_DECREF(((PyObject *)__pyx_v_adapter)); __pyx_v_adapter = ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":139 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":138 */ Py_INCREF(__pyx_v_adapter->py_obj); Py_DECREF(__pyx_v_py_obj); __pyx_v_py_obj = __pyx_v_adapter->py_obj; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":141 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_IntType); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":140 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; goto __pyx_L2;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_IntType); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_LongType); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; goto __pyx_L2;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_LongType); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; goto __pyx_L2;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_3); __pyx_4 = 0; __pyx_3 = 0; - __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_2); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} + __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_2); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - if (PyObject_SetItem(__pyx_v_py_obj, __pyx_v_key, __pyx_v_value) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 142; goto __pyx_L2;} + if (PyObject_SetItem(__pyx_v_py_obj, __pyx_v_key, __pyx_v_value) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 141; goto __pyx_L2;} goto __pyx_L6; } - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} - __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_StringTypes); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 142; goto __pyx_L2;} + __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_UnicodeType); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 142; goto __pyx_L2;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} + __pyx_1 = PyObject_IsInstance(__pyx_v_key,__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 142; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_2 = PySequence_GetSlice(__pyx_v_key, 0, 1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; goto __pyx_L2;} - if (PyObject_Cmp(__pyx_2, __pyx_n__, &__pyx_1) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; goto __pyx_L2;} + __pyx_2 = PySequence_GetSlice(__pyx_v_key, 0, 1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_unicode); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} + Py_INCREF(__pyx_n__); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_n__); + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} + Py_DECREF(__pyx_4); __pyx_4 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; + if (PyObject_Cmp(__pyx_2, __pyx_5, &__pyx_1) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} __pyx_1 = __pyx_1 != 0; Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_1 = PyObject_HasAttr(__pyx_v_py_obj,__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; goto __pyx_L2;} + __pyx_1 = PyObject_HasAttr(__pyx_v_py_obj,__pyx_v_key); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 143; goto __pyx_L2;} } if (__pyx_1) { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":145 */ - __pyx_4 = PyObject_GetAttr(__pyx_v_py_obj,__pyx_v_key); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 145; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":144 */ + __pyx_4 = PyObject_GetAttr(__pyx_v_py_obj,__pyx_v_key); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; goto __pyx_L2;} Py_DECREF(__pyx_v_attr); __pyx_v_attr = __pyx_4; __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":146 */ - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_callable); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 146; goto __pyx_L2;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 146; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":145 */ + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_callable); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 145; goto __pyx_L2;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 145; goto __pyx_L2;} Py_INCREF(__pyx_v_attr); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_attr); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 146; goto __pyx_L2;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 145; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 146; goto __pyx_L2;} - Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_5 = (!__pyx_1); - if (__pyx_5) { - __pyx_6 = PyObject_SetAttr(__pyx_v_py_obj,__pyx_v_key,__pyx_v_value); if (__pyx_6 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 147; goto __pyx_L2;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 145; goto __pyx_L2;} + Py_DECREF(__pyx_5); __pyx_5 = 0; + __pyx_6 = (!__pyx_1); + if (__pyx_6) { + __pyx_7 = PyObject_SetAttr(__pyx_v_py_obj,__pyx_v_key,__pyx_v_value); if (__pyx_7 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 146; goto __pyx_L2;} goto __pyx_L8; } __pyx_L8:; @@ -2543,50 +2718,51 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___set_property_callb goto __pyx_L6; } /*else*/ { - __pyx_3 = PyNumber_Remainder(__pyx_k48p, __pyx_v_key); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 149; goto __pyx_L2;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 149; goto __pyx_L2;} - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3); - __pyx_3 = 0; - __pyx_4 = PyObject_CallObject(PyExc_AssertionError, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 149; goto __pyx_L2;} + __pyx_4 = PyNumber_Remainder(__pyx_k50p, __pyx_v_key); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 148; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 148; goto __pyx_L2;} + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); + __pyx_4 = 0; + __pyx_2 = PyObject_CallObject(PyExc_AssertionError, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 148; goto __pyx_L2;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - __Pyx_Raise(__pyx_4, 0, 0); - Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 149; goto __pyx_L2;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 148; goto __pyx_L2;} } __pyx_L6:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":151 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":150 */ __pyx_r = JS_TRUE; goto __pyx_L0; } goto __pyx_L3; __pyx_L2:; + Py_XDECREF(__pyx_5); __pyx_5 = 0; + Py_XDECREF(__pyx_4); __pyx_4 = 0; Py_XDECREF(__pyx_3); __pyx_3 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; - Py_XDECREF(__pyx_4); __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":152 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":151 */ /*except:*/ { __Pyx_AddTraceback("spidermonkey.__set_property_callback__"); - if (__Pyx_GetException(&__pyx_3, &__pyx_2, &__pyx_4) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; goto __pyx_L1;} + if (__Pyx_GetException(&__pyx_5, &__pyx_4, &__pyx_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 151; goto __pyx_L1;} - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":153 */ - __pyx_7 = __Pyx_GetName(__pyx_m, __pyx_n_traceback); if (!__pyx_7) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 153; goto __pyx_L1;} - __pyx_8 = PyObject_GetAttr(__pyx_7, __pyx_n_print_exc); if (!__pyx_8) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 153; goto __pyx_L1;} - Py_DECREF(__pyx_7); __pyx_7 = 0; - __pyx_7 = PyObject_CallObject(__pyx_8, 0); if (!__pyx_7) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 153; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":152 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_traceback); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; goto __pyx_L1;} + __pyx_8 = PyObject_GetAttr(__pyx_2, __pyx_n_print_exc); if (!__pyx_8) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_2 = PyObject_CallObject(__pyx_8, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; goto __pyx_L1;} Py_DECREF(__pyx_8); __pyx_8 = 0; - Py_DECREF(__pyx_7); __pyx_7 = 0; + Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":154 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":153 */ __pyx_r = __pyx_f_12spidermonkey_report_python_error(__pyx_v_cx); - Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; + Py_DECREF(__pyx_5); __pyx_5 = 0; goto __pyx_L0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; goto __pyx_L3; } __pyx_L3:; @@ -2597,7 +2773,7 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___set_property_callb Py_XDECREF(__pyx_2); Py_XDECREF(__pyx_3); Py_XDECREF(__pyx_4); - Py_XDECREF(__pyx_7); + Py_XDECREF(__pyx_5); Py_XDECREF(__pyx_8); __Pyx_WriteUnraisable("spidermonkey.__set_property_callback__"); __pyx_r = 0; @@ -2621,53 +2797,53 @@ static void __pyx_f_12spidermonkey___finalize_callback__(struct JSContext *__pyx __pyx_v_pycx = ((struct __pyx_obj_12spidermonkey_Context *)Py_None); Py_INCREF(Py_None); __pyx_v_py_obj = ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)Py_None); Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":161 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":160 */ /*try:*/ { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":162 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":161 */ __pyx_1 = (!js_context_has_data(__pyx_v_cx)); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 163; goto __pyx_L2;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 163; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 163; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 162; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 162; goto __pyx_L2;} + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 162; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 163; goto __pyx_L2;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 162; goto __pyx_L2;} goto __pyx_L4; } __pyx_L4:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":165 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":164 */ __pyx_1 = (!js_object_has_data(__pyx_v_cx,__pyx_v_js_obj)); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 166; goto __pyx_L2;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 166; goto __pyx_L2;} - Py_INCREF(__pyx_k50p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k50p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 166; goto __pyx_L2;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 165; goto __pyx_L2;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 165; goto __pyx_L2;} + Py_INCREF(__pyx_k52p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k52p); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 165; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 166; goto __pyx_L2;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 165; goto __pyx_L2;} goto __pyx_L5; } __pyx_L5:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":168 */ - __pyx_2 = js_context_fetch(__pyx_v_cx); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 168; goto __pyx_L2;} - if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_Context)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 168; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":167 */ + __pyx_2 = js_context_fetch(__pyx_v_cx); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 167; goto __pyx_L2;} + if (!__Pyx_TypeTest(__pyx_2, __pyx_ptype_12spidermonkey_Context)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 167; goto __pyx_L2;} Py_DECREF(((PyObject *)__pyx_v_pycx)); __pyx_v_pycx = ((struct __pyx_obj_12spidermonkey_Context *)__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":169 */ - __pyx_3 = js_object_destroy(__pyx_v_cx,__pyx_v_js_obj); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 169; goto __pyx_L2;} - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_12spidermonkey_ObjectAdapter)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 169; goto __pyx_L2;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":168 */ + __pyx_3 = js_object_destroy(__pyx_v_cx,__pyx_v_js_obj); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 168; goto __pyx_L2;} + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_12spidermonkey_ObjectAdapter)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 168; goto __pyx_L2;} Py_DECREF(((PyObject *)__pyx_v_py_obj)); __pyx_v_py_obj = ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)__pyx_3); __pyx_3 = 0; @@ -2678,10 +2854,10 @@ static void __pyx_f_12spidermonkey___finalize_callback__(struct JSContext *__pyx Py_XDECREF(__pyx_2); __pyx_2 = 0; Py_XDECREF(__pyx_3); __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":170 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":169 */ /*except:*/ { __Pyx_AddTraceback("spidermonkey.__finalize_callback__"); - if (__Pyx_GetException(&__pyx_4, &__pyx_2, &__pyx_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 170; goto __pyx_L1;} + if (__Pyx_GetException(&__pyx_4, &__pyx_2, &__pyx_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 169; goto __pyx_L1;} __pyx_f_12spidermonkey_report_python_error(__pyx_v_cx); Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -2712,27 +2888,27 @@ static PyObject *__pyx_f_12spidermonkey_js_classname(PyObject *__pyx_self, PyObj static char *__pyx_argnames[] = {"obj",0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_obj)) return 0; Py_INCREF(__pyx_v_obj); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_inspect); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_isclass); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; goto __pyx_L1;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_inspect); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_isclass); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; goto __pyx_L1;} Py_INCREF(__pyx_v_obj); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_obj); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_IsTrue(__pyx_3); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; goto __pyx_L1;} + __pyx_4 = PyObject_IsTrue(__pyx_3); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - __pyx_2 = PyObject_GetAttr(__pyx_v_obj, __pyx_n___name__); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 175; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_v_obj, __pyx_n___name__); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; goto __pyx_L2; } /*else*/ { - __pyx_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n___class__); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 177; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n___name__); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 177; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_v_obj, __pyx_n___class__); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 176; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n___name__); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 176; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_r = __pyx_3; __pyx_3 = 0; @@ -2782,39 +2958,39 @@ static int __pyx_f_12spidermonkey_12ClassAdapter___cinit__(PyObject *__pyx_v_sel Py_INCREF(__pyx_v_is_global); Py_INCREF(__pyx_v_flags); __pyx_v_name = Py_None; Py_INCREF(Py_None); - if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_cx), __pyx_ptype_12spidermonkey_Context, 1, "cx")) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 185; goto __pyx_L1;} - if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_parent), __pyx_ptype_12spidermonkey_ObjectAdapter, 1, "parent")) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 185; goto __pyx_L1;} + if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_cx), __pyx_ptype_12spidermonkey_Context, 1, "cx")) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 184; goto __pyx_L1;} + if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_parent), __pyx_ptype_12spidermonkey_ObjectAdapter, 1, "parent")) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 184; goto __pyx_L1;} - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":188 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":187 */ Py_INCREF(((PyObject *)__pyx_v_cx)); Py_DECREF(((PyObject *)((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->cx)); ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->cx = __pyx_v_cx; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":189 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":188 */ Py_INCREF(((PyObject *)__pyx_v_parent)); Py_DECREF(((PyObject *)((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->parent)); ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->parent = __pyx_v_parent; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":190 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":189 */ Py_INCREF(__pyx_v_py_class); Py_DECREF(((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->py_class); ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->py_class = __pyx_v_py_class; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":192 */ - __pyx_1 = PyObject_HasAttr(__pyx_v_py_class,__pyx_n___jsname__); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 192; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":191 */ + __pyx_1 = PyObject_HasAttr(__pyx_v_py_class,__pyx_n___jsname__); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 191; goto __pyx_L1;} if (__pyx_1) { - __pyx_2 = PyObject_GetAttr(__pyx_v_py_class, __pyx_n___jsname__); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 193; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_v_py_class, __pyx_n___jsname__); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 192; goto __pyx_L1;} Py_DECREF(__pyx_v_name); __pyx_v_name = __pyx_2; __pyx_2 = 0; goto __pyx_L2; } /*else*/ { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_js_classname); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_js_classname); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; goto __pyx_L1;} Py_INCREF(__pyx_v_py_class); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_py_class); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_v_name); @@ -2823,74 +2999,74 @@ static int __pyx_f_12spidermonkey_12ClassAdapter___cinit__(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":197 */ - __pyx_5 = __pyx_f_12spidermonkey_xmalloc((sizeof(struct JSClass))); if (__pyx_5 == NULL) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":196 */ + __pyx_5 = __pyx_f_12spidermonkey_xmalloc((sizeof(struct JSClass))); if (__pyx_5 == NULL) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; goto __pyx_L1;} ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class = ((struct JSClass *)__pyx_5); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":198 */ - __pyx_6 = PyObject_Length(__pyx_v_name); if (__pyx_6 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; goto __pyx_L1;} - __pyx_5 = __pyx_f_12spidermonkey_xmalloc(((__pyx_6 + 1) * (sizeof(char)))); if (__pyx_5 == NULL) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":197 */ + __pyx_6 = PyObject_Length(__pyx_v_name); if (__pyx_6 == -1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; goto __pyx_L1;} + __pyx_5 = __pyx_f_12spidermonkey_xmalloc(((__pyx_6 + 1) * (sizeof(char)))); if (__pyx_5 == NULL) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; goto __pyx_L1;} ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->name = ((char *)__pyx_5); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":199 */ - __pyx_7 = PyString_AsString(__pyx_v_name); if (!__pyx_7) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 199; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":198 */ + __pyx_7 = PyString_AsString(__pyx_v_name); if (!__pyx_7) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; goto __pyx_L1;} strcpy(((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->name,__pyx_7); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":201 */ - __pyx_2 = PyInt_FromLong(JSCLASS_HAS_PRIVATE); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 201; goto __pyx_L1;} - __pyx_3 = PyNumber_Or(__pyx_v_flags, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 201; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":200 */ + __pyx_2 = PyInt_FromLong(JSCLASS_HAS_PRIVATE); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 200; goto __pyx_L1;} + __pyx_3 = PyNumber_Or(__pyx_v_flags, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 200; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_8 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 201; goto __pyx_L1;} + __pyx_8 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 200; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->flags = __pyx_8; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":202 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":201 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->addProperty = JS_PropertyStub; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":203 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":202 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->delProperty = JS_PropertyStub; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":204 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":203 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->getProperty = __pyx_f_12spidermonkey___get_property_callback__; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":205 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":204 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->setProperty = __pyx_f_12spidermonkey___set_property_callback__; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":206 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":205 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->enumerate = JS_EnumerateStub; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":207 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":206 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->convert = JS_ConvertStub; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":208 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":207 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->finalize = __pyx_f_12spidermonkey___finalize_callback__; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":209 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":208 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->getObjectOps = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":210 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":209 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->checkAccess = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":211 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":210 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->call = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":212 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":211 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->construct = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":213 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":212 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->xdrObject = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":214 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":213 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->hasInstance = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":215 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":214 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->mark = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":216 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":215 */ ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->reserveSlots = NULL; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":218 */ - __pyx_1 = PyObject_IsTrue(__pyx_v_is_global); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 218; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":217 */ + __pyx_1 = PyObject_IsTrue(__pyx_v_is_global); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 217; goto __pyx_L1;} if (__pyx_1) { ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->resolve = __pyx_f_12spidermonkey___resolve_global_callback__; goto __pyx_L3; @@ -2900,31 +3076,31 @@ static int __pyx_f_12spidermonkey_12ClassAdapter___cinit__(PyObject *__pyx_v_sel } __pyx_L3:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":223 */ - __pyx_1 = PyObject_IsTrue(__pyx_v_bind_constructor); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 223; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":222 */ + __pyx_1 = PyObject_IsTrue(__pyx_v_bind_constructor); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 222; goto __pyx_L1;} if (__pyx_1) { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":224 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":223 */ __pyx_v_proto = JS_InitClass(((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->cx->cx,__pyx_v_parent->js_obj,NULL,((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class,__pyx_f_12spidermonkey___constructor_callback__,0,NULL,NULL,NULL,NULL); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":226 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":225 */ __pyx_1 = (__pyx_v_proto == NULL); if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 227; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 227; goto __pyx_L1;} - Py_INCREF(__pyx_k54p); - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k54p); - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 227; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 226; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 226; goto __pyx_L1;} + Py_INCREF(__pyx_k56p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k56p); + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 226; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[5]; __pyx_lineno = 227; goto __pyx_L1;} + {__pyx_filename = __pyx_f[5]; __pyx_lineno = 226; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":228 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":227 */ js_object_attach(__pyx_v_cx->cx,__pyx_v_proto,((struct PyObject *)__pyx_v_self)); goto __pyx_L4; } @@ -2955,7 +3131,7 @@ static PyObject *__pyx_f_12spidermonkey_12ClassAdapter___repr__(PyObject *__pyx_ PyObject *__pyx_r; PyObject *__pyx_1 = 0; Py_INCREF(__pyx_v_self); - __pyx_1 = PyNumber_Remainder(__pyx_k55p, ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->py_class); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 231; goto __pyx_L1;} + __pyx_1 = PyNumber_Remainder(__pyx_k57p, ((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->py_class); if (!__pyx_1) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 230; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -2978,7 +3154,7 @@ static void __pyx_f_12spidermonkey_12ClassAdapter___dealloc__(PyObject *__pyx_v_ __pyx_1 = (((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class != 0); if (__pyx_1) { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":235 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":234 */ __pyx_1 = (((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->name != 0); if (__pyx_1) { free(((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class->name); @@ -2986,7 +3162,7 @@ static void __pyx_f_12spidermonkey_12ClassAdapter___dealloc__(PyObject *__pyx_v_ } __pyx_L3:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":237 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsclass.pxi":236 */ free(((struct __pyx_obj_12spidermonkey_ClassAdapter *)__pyx_v_self)->js_class); goto __pyx_L2; } @@ -3055,7 +3231,7 @@ static PyObject *__pyx_f_12spidermonkey_13ObjectAdapter___repr__(PyObject *__pyx PyObject *__pyx_r; PyObject *__pyx_1 = 0; Py_INCREF(__pyx_v_self); - __pyx_1 = PyNumber_Remainder(__pyx_k56p, ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)__pyx_v_self)->py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 17; goto __pyx_L1;} + __pyx_1 = PyNumber_Remainder(__pyx_k58p, ((struct __pyx_obj_12spidermonkey_ObjectAdapter *)__pyx_v_self)->py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 17; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -3225,8 +3401,8 @@ static PyObject *__pyx_f_12spidermonkey_js2py_object(struct __pyx_obj_12spidermo /*else*/ { __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_1) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 45; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 45; goto __pyx_L1;} - Py_INCREF(__pyx_k59p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k59p); + Py_INCREF(__pyx_k61p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k61p); __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 45; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -3289,8 +3465,8 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_object(struct _ if (__pyx_4) { __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_1) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 56; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 56; goto __pyx_L1;} - Py_INCREF(__pyx_k60p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k60p); + Py_INCREF(__pyx_k62p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k62p); __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 56; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -3574,7 +3750,7 @@ static PyObject *__pyx_f_12spidermonkey_15FunctionAdapter___repr__(PyObject *__p PyObject *__pyx_r; PyObject *__pyx_1 = 0; Py_INCREF(__pyx_v_self); - __pyx_1 = PyNumber_Remainder(__pyx_k61p, ((struct __pyx_obj_12spidermonkey_FunctionAdapter *)__pyx_v_self)->py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 45; goto __pyx_L1;} + __pyx_1 = PyNumber_Remainder(__pyx_k63p, ((struct __pyx_obj_12spidermonkey_FunctionAdapter *)__pyx_v_self)->py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 45; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -3620,8 +3796,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___bound_method_callb if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 56; goto __pyx_L2;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 56; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 56; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -3772,8 +3948,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___function_callback_ if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 89; goto __pyx_L2;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 89; goto __pyx_L2;} - Py_INCREF(__pyx_k40p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k40p); + Py_INCREF(__pyx_k41p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k41p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 89; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -3802,8 +3978,8 @@ static __pyx_t_12spidermonkey_JSBool __pyx_f_12spidermonkey___function_callback_ if (__pyx_1) { __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 96; goto __pyx_L2;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 96; goto __pyx_L2;} - Py_INCREF(__pyx_k62p); - PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k62p); + Py_INCREF(__pyx_k64p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k64p); __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 96; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -4085,8 +4261,8 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_bound_method(st /*else*/ { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; goto __pyx_L1;} - Py_INCREF(__pyx_k68p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k68p); + Py_INCREF(__pyx_k70p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k70p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 137; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4164,8 +4340,8 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_function(struct /*else*/ { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 154; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 154; goto __pyx_L1;} - Py_INCREF(__pyx_k68p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k68p); + Py_INCREF(__pyx_k70p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k70p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 154; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4347,8 +4523,8 @@ static PyObject *__pyx_f_12spidermonkey_js2py_array(struct __pyx_obj_12spidermon if (__pyx_4) { __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_1) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 25; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 25; goto __pyx_L1;} - Py_INCREF(__pyx_k71p); - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k71p); + Py_INCREF(__pyx_k73p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k73p); __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 25; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -4420,8 +4596,8 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_array(struct __ if (__pyx_4) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; goto __pyx_L1;} - Py_INCREF(__pyx_k72p); - PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k72p); + Py_INCREF(__pyx_k74p); + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k74p); __pyx_6 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_6) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 41; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; @@ -4661,8 +4837,8 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_double(struct _ if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 14; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 14; goto __pyx_L1;} - Py_INCREF(__pyx_k75p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k75p); + Py_INCREF(__pyx_k77p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k77p); __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 14; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4769,6 +4945,9 @@ static PyObject *__pyx_f_12spidermonkey_js2py_hash(struct __pyx_obj_12spidermonk __pyx_t_12spidermonkey_jsval __pyx_v_jsv; int __pyx_v_i; PyDictObject *__pyx_v_ret; + struct JSString *__pyx_v_converted; + __pyx_t_12spidermonkey_jschar *__pyx_v_data; + __pyx_t_12spidermonkey_size_t __pyx_v_length; PyObject *__pyx_v_key; PyObject *__pyx_r; int __pyx_1; @@ -4776,158 +4955,165 @@ static PyObject *__pyx_f_12spidermonkey_js2py_hash(struct __pyx_obj_12spidermonk PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; __pyx_t_12spidermonkey_jsint __pyx_5; - char *__pyx_6; - __pyx_t_12spidermonkey_jsint __pyx_7; + __pyx_t_12spidermonkey_jsint __pyx_6; Py_INCREF(__pyx_v_cx); __pyx_v_ret = ((PyDictObject *)Py_None); Py_INCREF(Py_None); __pyx_v_key = Py_None; Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":17 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":20 */ __pyx_v_hash = JSVAL_TO_OBJECT(__pyx_v_v); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":19 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":22 */ __pyx_v_props = JS_Enumerate(__pyx_v_cx->cx,__pyx_v_hash); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":20 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":23 */ __pyx_1 = (__pyx_v_props == NULL); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 21; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 21; goto __pyx_L1;} - Py_INCREF(__pyx_k78p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k78p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 21; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 24; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 24; goto __pyx_L1;} + Py_INCREF(__pyx_k80p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k80p); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 24; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 21; goto __pyx_L1;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 24; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":23 */ - __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 23; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_2, (&PyDict_Type))) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 23; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":26 */ + __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 26; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_2, (&PyDict_Type))) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 26; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_ret)); __pyx_v_ret = ((PyDictObject *)__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":25 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":28 */ /*try:*/ { __pyx_5 = __pyx_v_props->length; for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":27 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":30 */ __pyx_1 = (!JS_IdToValue(__pyx_v_cx->cx,(__pyx_v_props->vector[__pyx_v_i]),(&__pyx_v_jskey))); if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 28; goto __pyx_L4;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 28; goto __pyx_L4;} - Py_INCREF(__pyx_k79p); - PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k79p); - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 28; goto __pyx_L4;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 31; goto __pyx_L4;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 31; goto __pyx_L4;} + Py_INCREF(__pyx_k81p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k81p); + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 31; goto __pyx_L4;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 28; goto __pyx_L4;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 31; goto __pyx_L4;} goto __pyx_L8; } __pyx_L8:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":30 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_js_is_string); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 30; goto __pyx_L4;} - __pyx_4 = PyInt_FromLong(__pyx_v_jskey); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 30; goto __pyx_L4;} - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 30; goto __pyx_L4;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":33 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_js_is_string); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} + __pyx_4 = PyInt_FromLong(__pyx_v_jskey); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} Py_INCREF(((PyObject *)__pyx_v_cx)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_cx)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 30; goto __pyx_L4;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 30; goto __pyx_L4;} + __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":31 */ - __pyx_3 = __pyx_f_12spidermonkey_js2py_string(__pyx_v_cx,__pyx_v_jskey); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 31; goto __pyx_L4;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":34 */ + __pyx_3 = __pyx_f_12spidermonkey_js2py_string(__pyx_v_cx,__pyx_v_jskey); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 34; goto __pyx_L4;} Py_DECREF(__pyx_v_key); __pyx_v_key = __pyx_3; __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":32 */ - __pyx_6 = PyString_AsString(__pyx_v_key); if (!__pyx_6) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 32; goto __pyx_L4;} - __pyx_1 = (!JS_GetProperty(__pyx_v_cx->cx,__pyx_v_hash,__pyx_6,(&__pyx_v_jsv))); + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":36 */ + __pyx_v_converted = __pyx_f_12spidermonkey_py2js_jsstring(__pyx_v_cx->cx,__pyx_v_key); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":37 */ + __pyx_v_data = JS_GetStringChars(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":38 */ + __pyx_v_length = JS_GetStringLength(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":40 */ + __pyx_1 = (!JS_GetUCProperty(__pyx_v_cx->cx,__pyx_v_hash,__pyx_v_data,__pyx_v_length,(&__pyx_v_jsv))); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} - Py_INCREF(__pyx_k81p); - PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k81p); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 41; goto __pyx_L4;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 41; goto __pyx_L4;} + Py_INCREF(__pyx_k83p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k83p); + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 41; goto __pyx_L4;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 33; goto __pyx_L4;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 41; goto __pyx_L4;} goto __pyx_L10; } __pyx_L10:; goto __pyx_L9; } - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_js_is_int); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 34; goto __pyx_L4;} - __pyx_4 = PyInt_FromLong(__pyx_v_jskey); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 34; goto __pyx_L4;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 34; goto __pyx_L4;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_js_is_int); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 42; goto __pyx_L4;} + __pyx_4 = PyInt_FromLong(__pyx_v_jskey); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 42; goto __pyx_L4;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 42; goto __pyx_L4;} Py_INCREF(((PyObject *)__pyx_v_cx)); PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_cx)); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 34; goto __pyx_L4;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 42; goto __pyx_L4;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 34; goto __pyx_L4;} + __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 42; goto __pyx_L4;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":35 */ - __pyx_2 = __pyx_f_12spidermonkey_js2py_int(__pyx_v_cx,__pyx_v_jskey); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 35; goto __pyx_L4;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":43 */ + __pyx_2 = __pyx_f_12spidermonkey_js2py_int(__pyx_v_cx,__pyx_v_jskey); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 43; goto __pyx_L4;} Py_DECREF(__pyx_v_key); __pyx_v_key = __pyx_2; __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":36 */ - __pyx_7 = PyInt_AsLong(__pyx_v_key); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 36; goto __pyx_L4;} - __pyx_1 = (!JS_GetElement(__pyx_v_cx->cx,__pyx_v_hash,__pyx_7,(&__pyx_v_jsv))); + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":44 */ + __pyx_6 = PyInt_AsLong(__pyx_v_key); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 44; goto __pyx_L4;} + __pyx_1 = (!JS_GetElement(__pyx_v_cx->cx,__pyx_v_hash,__pyx_6,(&__pyx_v_jsv))); if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 37; goto __pyx_L4;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 37; goto __pyx_L4;} - Py_INCREF(__pyx_k83p); - PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k83p); - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 37; goto __pyx_L4;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 45; goto __pyx_L4;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 45; goto __pyx_L4;} + Py_INCREF(__pyx_k85p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k85p); + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 45; goto __pyx_L4;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 37; goto __pyx_L4;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 45; goto __pyx_L4;} goto __pyx_L11; } __pyx_L11:; goto __pyx_L9; } /*else*/ { - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 39; goto __pyx_L4;} - Py_INCREF(__pyx_k84p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k84p); - __pyx_4 = PyObject_CallObject(PyExc_AssertionError, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 39; goto __pyx_L4;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 47; goto __pyx_L4;} + Py_INCREF(__pyx_k86p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k86p); + __pyx_4 = PyObject_CallObject(PyExc_AssertionError, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 47; goto __pyx_L4;} Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 39; goto __pyx_L4;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 47; goto __pyx_L4;} } __pyx_L9:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":41 */ - __pyx_2 = __pyx_f_12spidermonkey_js2py(__pyx_v_cx,__pyx_v_jsv); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 41; goto __pyx_L4;} - if (PyObject_SetItem(((PyObject *)__pyx_v_ret), __pyx_v_key, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 41; goto __pyx_L4;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":49 */ + __pyx_2 = __pyx_f_12spidermonkey_js2py(__pyx_v_cx,__pyx_v_jsv); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 49; goto __pyx_L4;} + if (PyObject_SetItem(((PyObject *)__pyx_v_ret), __pyx_v_key, __pyx_2) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 49; goto __pyx_L4;} Py_DECREF(__pyx_2); __pyx_2 = 0; } } @@ -4959,7 +5145,7 @@ static PyObject *__pyx_f_12spidermonkey_js2py_hash(struct __pyx_obj_12spidermonk } } - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":45 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":53 */ Py_INCREF(((PyObject *)__pyx_v_ret)); __pyx_r = ((PyObject *)__pyx_v_ret); goto __pyx_L0; @@ -4982,6 +5168,9 @@ static PyObject *__pyx_f_12spidermonkey_js2py_hash(struct __pyx_obj_12spidermonk static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_hash(struct __pyx_obj_12spidermonkey_Context *__pyx_v_cx,PyDictObject *__pyx_v_py_obj,struct JSObject *__pyx_v_parent) { struct JSObject *__pyx_v_obj; __pyx_t_12spidermonkey_jsval __pyx_v_elem; + struct JSString *__pyx_v_converted; + __pyx_t_12spidermonkey_jschar *__pyx_v_data; + __pyx_t_12spidermonkey_size_t __pyx_v_length; PyObject *__pyx_v_k; PyObject *__pyx_v_v; __pyx_t_12spidermonkey_jsval __pyx_r; @@ -4990,83 +5179,112 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_hash(struct __p PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; __pyx_t_12spidermonkey_jsval __pyx_5; - char *__pyx_6; - PyObject *__pyx_7 = 0; + PyObject *__pyx_6 = 0; Py_INCREF(__pyx_v_cx); Py_INCREF(__pyx_v_py_obj); __pyx_v_k = Py_None; Py_INCREF(Py_None); __pyx_v_v = Py_None; Py_INCREF(Py_None); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":52 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":63 */ __pyx_v_obj = JS_NewObject(__pyx_v_cx->cx,NULL,NULL,__pyx_v_parent); - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":53 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":64 */ __pyx_1 = (__pyx_v_obj == NULL); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 54; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 54; goto __pyx_L1;} - Py_INCREF(__pyx_k85p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k85p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 54; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 65; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 65; goto __pyx_L1;} + Py_INCREF(__pyx_k87p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k87p); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 65; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 54; goto __pyx_L1;} + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 65; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":56 */ - __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_py_obj), __pyx_n_iteritems); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} - __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":67 */ + __pyx_2 = PyObject_GetAttr(((PyObject *)__pyx_v_py_obj), __pyx_n_iteritems); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyObject_GetIter(__pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + __pyx_4 = PyObject_GetIter(__pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; for (;;) { __pyx_2 = PyIter_Next(__pyx_4); if (!__pyx_2) { - if (PyErr_Occurred()) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + if (PyErr_Occurred()) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} break; } - __pyx_3 = PyObject_GetIter(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + __pyx_3 = PyObject_GetIter(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + __pyx_2 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} Py_DECREF(__pyx_v_k); __pyx_v_k = __pyx_2; __pyx_2 = 0; - __pyx_2 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + __pyx_2 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} Py_DECREF(__pyx_v_v); __pyx_v_v = __pyx_2; __pyx_2 = 0; - if (__Pyx_EndUnpack(__pyx_3) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 56; goto __pyx_L1;} + if (__Pyx_EndUnpack(__pyx_3) < 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 67; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":57 */ - __pyx_5 = __pyx_f_12spidermonkey_py2js(__pyx_v_cx,__pyx_v_v,__pyx_v_obj); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 57; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":69 */ + __pyx_v_converted = __pyx_f_12spidermonkey_py2js_jsstring(__pyx_v_cx->cx,__pyx_v_k); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":70 */ + __pyx_v_data = JS_GetStringChars(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":71 */ + __pyx_v_length = JS_GetStringLength(__pyx_v_converted); + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":73 */ + __pyx_5 = __pyx_f_12spidermonkey_py2js(__pyx_v_cx,__pyx_v_v,__pyx_v_obj); if (__pyx_5 == 0) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 73; goto __pyx_L1;} __pyx_v_elem = __pyx_5; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":58 */ - __pyx_6 = PyString_AsString(__pyx_v_k); if (!__pyx_6) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 58; goto __pyx_L1;} - __pyx_1 = (!JS_SetProperty(__pyx_v_cx->cx,__pyx_v_obj,__pyx_6,(&__pyx_v_elem))); + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":74 */ + __pyx_2 = PyInt_FromLong(__pyx_v_elem); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 74; goto __pyx_L1;} + __pyx_1 = __pyx_2 == Py_None; + Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 59; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 59; goto __pyx_L1;} - Py_INCREF(__pyx_k87p); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k87p); - __pyx_7 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_7) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 59; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 75; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_stderr); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 75; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_write); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 75; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_2 = PyNumber_Remainder(__pyx_k89p, __pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 75; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 75; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2); + __pyx_2 = 0; + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 75; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __Pyx_Raise(__pyx_7, 0, 0); - Py_DECREF(__pyx_7); __pyx_7 = 0; - {__pyx_filename = __pyx_f[11]; __pyx_lineno = 59; goto __pyx_L1;} + Py_DECREF(__pyx_6); __pyx_6 = 0; + Py_DECREF(__pyx_2); __pyx_2 = 0; goto __pyx_L5; } __pyx_L5:; + + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":77 */ + __pyx_1 = (!JS_SetUCProperty(__pyx_v_cx->cx,__pyx_v_obj,__pyx_v_data,__pyx_v_length,(&__pyx_v_elem))); + if (__pyx_1) { + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_JSError); if (!__pyx_3) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 78; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 78; goto __pyx_L1;} + Py_INCREF(__pyx_k90p); + PyTuple_SET_ITEM(__pyx_6, 0, __pyx_k90p); + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_2) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 78; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_6); __pyx_6 = 0; + __Pyx_Raise(__pyx_2, 0, 0); + Py_DECREF(__pyx_2); __pyx_2 = 0; + {__pyx_filename = __pyx_f[11]; __pyx_lineno = 78; goto __pyx_L1;} + goto __pyx_L6; + } + __pyx_L6:; } Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":61 */ + /* "/usr/local/src/python-spidermonkey/spidermonkey/jshash.pxi":80 */ __pyx_r = OBJECT_TO_JSVAL(__pyx_v_obj); goto __pyx_L0; @@ -5076,7 +5294,7 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_hash(struct __p Py_XDECREF(__pyx_2); Py_XDECREF(__pyx_3); Py_XDECREF(__pyx_4); - Py_XDECREF(__pyx_7); + Py_XDECREF(__pyx_6); __Pyx_WriteUnraisable("spidermonkey.py2js_hash"); __pyx_r = 0; __pyx_L0:; @@ -5231,7 +5449,7 @@ static PyObject *__pyx_f_12spidermonkey_py_is_string(PyObject *__pyx_self, PyObj Py_INCREF(__pyx_v_py_obj); if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_cx), __pyx_ptype_12spidermonkey_Context, 1, "cx")) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 7; goto __pyx_L1;} __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_types); if (!__pyx_1) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 8; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_StringTypes); if (!__pyx_2) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 8; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_UnicodeType); if (!__pyx_2) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 8; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyObject_IsInstance(__pyx_v_py_obj,__pyx_2); if (__pyx_3 == -1) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 8; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -5253,57 +5471,43 @@ static PyObject *__pyx_f_12spidermonkey_py_is_string(PyObject *__pyx_self, PyObj return __pyx_r; } -static PyObject *__pyx_f_12spidermonkey_js2py_string(struct __pyx_obj_12spidermonkey_Context *__pyx_v_cx,__pyx_t_12spidermonkey_jsval __pyx_v_jsv) { - struct JSString *__pyx_v_s; - PyObject *__pyx_r; - PyObject *__pyx_1 = 0; +static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_string(struct __pyx_obj_12spidermonkey_Context *__pyx_v_cx,PyObject *__pyx_v_py_obj,struct JSObject *__pyx_v_parent) { + struct JSString *__pyx_v_conv; + __pyx_t_12spidermonkey_jsval __pyx_r; Py_INCREF(__pyx_v_cx); + Py_INCREF(__pyx_v_py_obj); /* "/usr/local/src/python-spidermonkey/spidermonkey/jsstring.pxi":12 */ - __pyx_v_s = JSVAL_TO_STRING(__pyx_v_jsv); + __pyx_v_conv = __pyx_f_12spidermonkey_py2js_jsstring(__pyx_v_cx->cx,__pyx_v_py_obj); /* "/usr/local/src/python-spidermonkey/spidermonkey/jsstring.pxi":13 */ - __pyx_1 = PyString_FromString(JS_GetStringBytes(__pyx_v_s)); if (!__pyx_1) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 13; goto __pyx_L1;} - __pyx_r = __pyx_1; - __pyx_1 = 0; + __pyx_r = STRING_TO_JSVAL(__pyx_v_conv); goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); - __Pyx_AddTraceback("spidermonkey.js2py_string"); __pyx_r = 0; __pyx_L0:; Py_DECREF(__pyx_v_cx); + Py_DECREF(__pyx_v_py_obj); return __pyx_r; } -static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js_string(struct __pyx_obj_12spidermonkey_Context *__pyx_v_cx,PyObject *__pyx_v_py_obj,struct JSObject *__pyx_v_parent) { - struct JSString *__pyx_v_s; - __pyx_t_12spidermonkey_jsval __pyx_r; - char *__pyx_1; - Py_ssize_t __pyx_2; +static PyObject *__pyx_f_12spidermonkey_js2py_string(struct __pyx_obj_12spidermonkey_Context *__pyx_v_cx,__pyx_t_12spidermonkey_jsval __pyx_v_jsv) { + PyObject *__pyx_r; + PyObject *__pyx_1 = 0; Py_INCREF(__pyx_v_cx); - Py_INCREF(__pyx_v_py_obj); - - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsstring.pxi":20 */ - __pyx_1 = PyString_AsString(__pyx_v_py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 20; goto __pyx_L1;} - __pyx_2 = PyObject_Length(__pyx_v_py_obj); if (__pyx_2 == -1) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 20; goto __pyx_L1;} - __pyx_v_s = JS_NewStringCopyN(__pyx_v_cx->cx,__pyx_1,__pyx_2); - - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsstring.pxi":21 */ - __pyx_r = STRING_TO_JSVAL(__pyx_v_s); + __pyx_1 = __pyx_f_12spidermonkey_js2py_jsstring(JSVAL_TO_STRING(__pyx_v_jsv)); if (!__pyx_1) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 16; goto __pyx_L1;} + __pyx_r = __pyx_1; + __pyx_1 = 0; goto __pyx_L0; - __pyx_r = 0; + __pyx_r = Py_None; Py_INCREF(Py_None); goto __pyx_L0; __pyx_L1:; - __Pyx_WriteUnraisable("spidermonkey.py2js_string"); + Py_XDECREF(__pyx_1); + __Pyx_AddTraceback("spidermonkey.js2py_string"); __pyx_r = 0; __pyx_L0:; Py_DECREF(__pyx_v_cx); - Py_DECREF(__pyx_v_py_obj); return __pyx_r; } @@ -5576,7 +5780,7 @@ static __pyx_t_12spidermonkey_jsval __pyx_f_12spidermonkey_py2js(struct __pyx_ob goto __pyx_L2; } /*else*/ { - __pyx_1 = PyNumber_Remainder(__pyx_k99p, __pyx_v_py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 26; goto __pyx_L1;} + __pyx_1 = PyNumber_Remainder(__pyx_k102p, __pyx_v_py_obj); if (!__pyx_1) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 26; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 26; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); __pyx_1 = 0; @@ -5782,7 +5986,7 @@ static PyObject *__pyx_f_12spidermonkey_js2py(struct __pyx_obj_12spidermonkey_Co } /*else*/ { __pyx_3 = PyInt_FromLong(__pyx_v_jsv); if (!__pyx_3) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 48; goto __pyx_L1;} - __pyx_2 = PyNumber_Remainder(__pyx_k107p, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 48; goto __pyx_L1;} + __pyx_2 = PyNumber_Remainder(__pyx_k110p, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 48; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 48; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2); @@ -7192,6 +7396,7 @@ PyTypeObject __pyx_type_12spidermonkey_FunctionAdapter = { }; static struct PyMethodDef __pyx_methods[] = { + {"test_utf_16_round_trip", (PyCFunction)__pyx_f_12spidermonkey_test_utf_16_round_trip, METH_VARARGS|METH_KEYWORDS, 0}, {"js_classname", (PyCFunction)__pyx_f_12spidermonkey_js_classname, METH_VARARGS|METH_KEYWORDS, 0}, {"js_is_object", (PyCFunction)__pyx_f_12spidermonkey_js_is_object, METH_VARARGS|METH_KEYWORDS, 0}, {"py_is_object", (PyCFunction)__pyx_f_12spidermonkey_py_is_object, METH_VARARGS|METH_KEYWORDS, 0}, @@ -7257,8 +7462,8 @@ PyMODINIT_FUNC initspidermonkey(void) { if (PyObject_SetAttrString(__pyx_m, "Value", (PyObject *)&__pyx_type_12spidermonkey_Value) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 50; goto __pyx_L1;} __pyx_ptype_12spidermonkey_Value = &__pyx_type_12spidermonkey_Value; __pyx_type_12spidermonkey_ClassAdapter.tp_free = _PyObject_GC_Del; - if (PyType_Ready(&__pyx_type_12spidermonkey_ClassAdapter) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 179; goto __pyx_L1;} - if (PyObject_SetAttrString(__pyx_m, "ClassAdapter", (PyObject *)&__pyx_type_12spidermonkey_ClassAdapter) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 179; goto __pyx_L1;} + if (PyType_Ready(&__pyx_type_12spidermonkey_ClassAdapter) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 178; goto __pyx_L1;} + if (PyObject_SetAttrString(__pyx_m, "ClassAdapter", (PyObject *)&__pyx_type_12spidermonkey_ClassAdapter) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 178; goto __pyx_L1;} __pyx_ptype_12spidermonkey_ClassAdapter = &__pyx_type_12spidermonkey_ClassAdapter; __pyx_type_12spidermonkey_ObjectAdapter.tp_free = _PyObject_GC_Del; if (PyType_Ready(&__pyx_type_12spidermonkey_ObjectAdapter) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 2; goto __pyx_L1;} @@ -7269,55 +7474,55 @@ PyMODINIT_FUNC initspidermonkey(void) { if (PyObject_SetAttrString(__pyx_m, "FunctionAdapter", (PyObject *)&__pyx_type_12spidermonkey_FunctionAdapter) < 0) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 35; goto __pyx_L1;} __pyx_ptype_12spidermonkey_FunctionAdapter = &__pyx_type_12spidermonkey_FunctionAdapter; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":392 */ - __pyx_1 = __Pyx_Import(__pyx_n_inspect, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_inspect, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":418 */ + __pyx_1 = __Pyx_Import(__pyx_n_inspect, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_inspect, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":393 */ - __pyx_1 = __Pyx_Import(__pyx_n_sys, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_sys, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":419 */ + __pyx_1 = __Pyx_Import(__pyx_n_sys, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 419; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_sys, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 419; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":394 */ - __pyx_1 = __Pyx_Import(__pyx_n_traceback, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_traceback, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":420 */ + __pyx_1 = __Pyx_Import(__pyx_n_traceback, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_traceback, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":395 */ - __pyx_1 = __Pyx_Import(__pyx_n_types, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_types, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":421 */ + __pyx_1 = __Pyx_Import(__pyx_n_types, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_types, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":397 */ - __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":423 */ + __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;} Py_INCREF(PyExc_Exception); PyTuple_SET_ITEM(__pyx_2, 0, PyExc_Exception); - __pyx_3 = __Pyx_CreateClass(__pyx_2, __pyx_1, __pyx_n_JSError, "spidermonkey"); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} + __pyx_3 = __Pyx_CreateClass(__pyx_2, __pyx_1, __pyx_n_JSError, "spidermonkey"); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":398 */ - __pyx_2 = PyCFunction_New(&__pyx_mdef_12spidermonkey_7JSError___init__, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;} - __pyx_4 = PyMethod_New(__pyx_2, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":424 */ + __pyx_2 = PyCFunction_New(&__pyx_mdef_12spidermonkey_7JSError___init__, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; goto __pyx_L1;} + __pyx_4 = PyMethod_New(__pyx_2, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - if (PyObject_SetAttr(__pyx_3, __pyx_n___init__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_3, __pyx_n___init__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":400 */ - __pyx_2 = PyCFunction_New(&__pyx_mdef_12spidermonkey_7JSError___str__, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;} - __pyx_4 = PyMethod_New(__pyx_2, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":426 */ + __pyx_2 = PyCFunction_New(&__pyx_mdef_12spidermonkey_7JSError___str__, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 426; goto __pyx_L1;} + __pyx_4 = PyMethod_New(__pyx_2, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 426; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - if (PyObject_SetAttr(__pyx_3, __pyx_n___str__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 400; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_3, __pyx_n___str__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 426; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":402 */ - __pyx_2 = PyCFunction_New(&__pyx_mdef_12spidermonkey_7JSError___repr__, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; goto __pyx_L1;} - __pyx_4 = PyMethod_New(__pyx_2, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; goto __pyx_L1;} + /* "/usr/local/src/python-spidermonkey/spidermonkey/jsapi.pxi":428 */ + __pyx_2 = PyCFunction_New(&__pyx_mdef_12spidermonkey_7JSError___repr__, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} + __pyx_4 = PyMethod_New(__pyx_2, 0, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - if (PyObject_SetAttr(__pyx_3, __pyx_n___repr__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 402; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_3, __pyx_n___repr__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - if (PyObject_SetAttr(__pyx_m, __pyx_n_JSError, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_JSError, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -7445,6 +7650,19 @@ raise_error: return; } +static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name) { + if (!type) { + PyErr_Format(PyExc_SystemError, "Missing type object"); + return 0; + } + if ((none_allowed && obj == Py_None) || PyObject_TypeCheck(obj, type)) + return 1; + PyErr_Format(PyExc_TypeError, + "Argument '%s' has incorrect type (expected %s, got %s)", + name, type->tp_name, obj->ob_type->tp_name); + return 0; +} + static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) { PyObject *result; result = PyObject_GetAttr(dict, name); @@ -7499,19 +7717,6 @@ bad: return -1; } -static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name) { - if (!type) { - PyErr_Format(PyExc_SystemError, "Missing type object"); - return 0; - } - if ((none_allowed && obj == Py_None) || PyObject_TypeCheck(obj, type)) - return 1; - PyErr_Format(PyExc_TypeError, - "Argument '%s' has incorrect type (expected %s, got %s)", - name, type->tp_name, obj->ob_type->tp_name); - return 0; -} - static int __Pyx_GetStarArgs( PyObject **args, PyObject **kwds, spidermonkey/spidermonkey.c @@ -8,11 +8,11 @@ class BindTest(unittest.TestCase): def __init__(self): self.arg = Nonce() self.window = self - self.name = "foobar" + self.name = u"foobar" self.val = 42 def foo(self, arg): self.arg = arg - return "hi %s" % arg + return u"hi %s" % arg self.window = Window() rt = spidermonkey.Runtime() self.cx = rt.create_context(self.window) @@ -23,27 +23,30 @@ class BindTest(unittest.TestCase): def __init__(self): self.bar = 1 f = foo() - self.cx.bind("spam", f) - self.assertEqual(self.cx.execute("spam;"), f.bar) + self.cx.bind(u"spam", f) + self.assertEqual(self.cx.execute(u"spam;"), f.bar) def test_bind_global(self): - self.assertEqual(self.cx.execute('name;'), self.window.name) - self.assertEqual(self.cx.execute('arg;'), self.window.arg) - self.assertEqual(self.cx.execute('window;'), self.window) - self.assertEqual(self.cx.execute('window.arg;'), self.window.arg) - self.assertEqual(self.cx.execute('foo(12);'), "hi 12") - self.assertEqual(self.cx.execute('arg;'), 12) - self.cx.execute('var spam = 13;') - self.assertEqual(self.cx.execute('spam;'), 13) - self.cx.execute('window.arg = 14;') - self.assertEqual(self.cx.execute('window.arg;'), 14) + self.assertEqual(self.cx.execute(u'name;'), self.window.name) + self.assertEqual(self.cx.execute(u'arg;'), self.window.arg) + self.assertEqual(self.cx.execute(u'window;'), self.window) + self.assertEqual(self.cx.execute(u'window.arg;'), self.window.arg) + self.assertEqual(self.cx.execute(u'foo(12);'), u"hi 12") + self.assertEqual(self.cx.execute(u'arg;'), 12) + self.cx.execute(u'var spam = 13;') + self.assertEqual(self.cx.execute(u'spam;'), 13) + self.cx.execute(u'window.arg = 14;') + self.assertEqual(self.cx.execute(u'window.arg;'), 14) self.assertEqual(self.window.arg, 14) def test_referenced(self): def bind(cx): - cx.bind("data", object()) - self.assertRaises(spidermonkey.JSError, self.cx.execute, "data;") + cx.bind(u"data", object()) + self.assertRaises(spidermonkey.JSError, self.cx.execute, u"data;") bind(self.cx) - self.assertNotEqual(self.cx.execute("data;"), None) - self.assertEqual(self.cx.execute("data;"), self.cx.unbind("data")) - self.assertRaises(spidermonkey.JSError, self.cx.execute, "data;") \ No newline at end of file + self.assertNotEqual(self.cx.execute(u"data;"), None) + self.assertEqual(self.cx.execute(u"data;"), self.cx.unbind(u"data")) + self.assertRaises(spidermonkey.JSError, self.cx.execute, u"data;") + +if __name__ == "__main__": + unittest.main() \ No newline at end of file tests/bind_test.py @@ -10,7 +10,7 @@ class ClassTests(unittest.TestCase): def __init__(self): self.args = [] self.val = 42 - self._private = "no peeking" + self._private = u"no peeking" def foo(self, *args): self.args.append(args) def _private_method(self): @@ -25,17 +25,17 @@ class ClassTests(unittest.TestCase): self.val = value self.cx.install_class(spam) self.spam = spam() - self.cx.bind("bs", self.spam) + self.cx.bind(u"bs", self.spam) def test_private(self): - self.assertEqual(self.cx.execute("bs._private;"), None) - self.cx.execute("bs._private = 1;") - self.assertEqual(self.spam._private, "no peeking") - self.assertEqual(self.cx.execute("bs._private_method;"), None) - self.assertEqual(self.cx.execute("bs._private_method = 1;"), True) + self.assertEqual(self.cx.execute(u"bs._private;"), None) + self.cx.execute(u"bs._private = 1;") + self.assertEqual(self.spam._private, u"no peeking") + self.assertEqual(self.cx.execute(u"bs._private_method;"), None) + self.assertEqual(self.cx.execute(u"bs._private_method = 1;"), True) self.assertEqual(isinstance(self.spam._private_method, types.MethodType), True) # in fact, even normal methods shouldn't be assignable to - self.assertEqual(self.cx.execute("bs.foo = 1;"), True) + self.assertEqual(self.cx.execute(u"bs.foo = 1;"), True) self.assertEqual(isinstance(self.spam.foo, types.MethodType), True) def test_bind_module(self): @@ -45,14 +45,14 @@ class ClassTests(unittest.TestCase): class foo: pass self.cx.install_class(foo, bind_constructor=False) - self.assertRaises(spidermonkey.JSError, self.cx.execute, "var f = new foo();") + self.assertRaises(spidermonkey.JSError, self.cx.execute, u"var f = new foo();") f2 = foo() - self.cx.bind("f2", f2) - self.assertEqual(self.cx.execute("f2;"), f2) + self.cx.bind(u"f2", f2) + self.assertEqual(self.cx.execute(u"f2;"), f2) def test_js_specific(self): class bar: - __jsname__ = "eggs" + __jsname__ = u"eggs" def __init__(self, arg): self.arg = arg @@ -60,30 +60,33 @@ class ClassTests(unittest.TestCase): def __jsinit__(cx): return bar(42) self.cx.install_class(bar) - self.cx.execute("var e = new eggs();") - self.assertEqual(self.cx.execute("e.arg;"), 42) + self.cx.execute(u"var e = new eggs();") + self.assertEqual(self.cx.execute(u"e.arg;"), 42) def test_assign_new_property(self): - self.cx.execute("bs.xyzzy = 1;") - self.assertEqual(self.cx.execute("bs.xyzzy;"), 1) + self.cx.execute(u"bs.xyzzy = 1;") + self.assertEqual(self.cx.execute(u"bs.xyzzy;"), 1) def test_identity(self): - self.assertEqual(self.cx.execute("bs;"), self.spam) + self.assertEqual(self.cx.execute(u"bs;"), self.spam) def test_call(self): - self.cx.execute('bs.foo("hi");') - self.assertEqual(self.spam.args.pop(), ("hi",)) + self.cx.execute(u'bs.foo("hi");') + self.assertEqual(self.spam.args.pop(), (u"hi",)) def test_construct(self): - s = self.cx.execute("""\ + s = self.cx.execute(u"""\ var s = new spam(); s.foo(1, "blah", ["1", 2, "three"]); s; """) - self.assertEqual(s.args.pop(), (1, "blah", ["1", 2, "three"])) + self.assertEqual(s.args.pop(), (1, u"blah", [u"1", 2, u"three"])) def test_getsetitem(self): # property lookup with an integer is mapped to __get/__setitem__ - self.assertEqual(self.cx.execute("bs[0];"), 42) - self.cx.execute("bs[0] = 2;") - self.assertEqual(self.cx.execute("bs[0];"), 2) + self.assertEqual(self.cx.execute(u"bs[0];"), 42) + self.cx.execute(u"bs[0] = 2;") + self.assertEqual(self.cx.execute(u"bs[0];"), 2) + +if __name__ == "__main__": + unittest.main() tests/class_test.py @@ -7,5 +7,8 @@ class ContextTest(unittest.TestCase): self.cx = rt.create_context() def test_scope(self): - self.cx.execute("var x = 42;") - self.assertEqual(self.cx.execute("x;"), 42) \ No newline at end of file + self.cx.execute(u"var x = 42;") + self.assertEqual(self.cx.execute(u"x;"), 42) + +if __name__ == "__main__": + unittest.main() \ No newline at end of file tests/context_test.py @@ -7,14 +7,17 @@ class DefineFunctionTest(unittest.TestCase): self.cx = rt.create_context() def test_define_function(self): - resp = self.cx.execute("function(val) {return val * 2;}") + resp = self.cx.execute(u"function(val) {return val * 2;}") self.assertEqual(resp(2), 4) def test_with_dict(self): - resp = self.cx.execute("function(doc) {if(doc.data) return doc.data;}") - self.assertEqual(resp({"data": 2}), 2) + resp = self.cx.execute(u"function(doc) {if(doc.data) return doc.data;}") + self.assertEqual(resp({u"data": 2}), 2) self.assertEqual(resp({}), None) def test_throw(self): - resp = self.cx.execute("function(doc) {throw(\"error\");}") - self.assertRaises(spidermonkey.JSError, resp) \ No newline at end of file + resp = self.cx.execute(u"function(doc) {throw(\"error\");}") + self.assertRaises(spidermonkey.JSError, resp) + +if __name__ == "__main__": + unittest.main() \ No newline at end of file tests/define_function_test.py @@ -7,4 +7,7 @@ class BindTest(unittest.TestCase): self.cx = rt.create_context() def test_error_thrown(self): - self.assertRaises(spidermonkey.JSError, self.cx.execute, 'throw("foo")') \ No newline at end of file + self.assertRaises(spidermonkey.JSError, self.cx.execute, u'throw("foo")') + +if __name__ == "__main__": + unittest.main() \ No newline at end of file tests/error_test.py @@ -9,7 +9,7 @@ class RoundtripTest(unittest.TestCase): def echo(arg): self.x.append(arg) return arg - self.cx.bind("echo", echo) + self.cx.bind(u"echo", echo) def check(self, script, arg): ret = self.cx.execute(script) @@ -17,12 +17,15 @@ class RoundtripTest(unittest.TestCase): self.assertEqual(self.x.pop(), arg) def test_primitive_types(self): - self.check("echo(42);", 42) - self.check("echo(42.5);", 42.5) - self.check('echo("spam");', "spam") - self.check("echo(undefined);", None) - self.check("echo(null);", None) - self.check("echo(true);", True) - self.check("echo(false);", False) + self.check(u"echo(42);", 42) + self.check(u"echo(42.5);", 42.5) + self.check(u'echo("spam");', u"spam") + self.check(u"echo(undefined);", None) + self.check(u"echo(null);", None) + self.check(u"echo(true);", True) + self.check(u"echo(false);", False) #self.check("echo(Infinity);", XXX) - #self.check("echo(NaN);", XXX) \ No newline at end of file + #self.check("echo(NaN);", XXX) + +if __name__ == '__main__': + unittest.main() tests/roundtrip_test.py @@ -6,21 +6,24 @@ class ToPythonTest(unittest.TestCase): rt = spidermonkey.Runtime() self.cx = rt.create_context() def test_primitive_types(self): - self.assertEqual(self.cx.execute("42;"), 42) - self.assertEqual(self.cx.execute("42.5;"), 42.5) - self.assertEqual(self.cx.execute('"spam";'), "spam") - self.assertEqual(self.cx.execute("undefined;"), None) - self.assertEqual(self.cx.execute("null;"), None) - self.assertEqual(self.cx.execute("true;"), True) - self.assertEqual(self.cx.execute("false;"), False) + self.assertEqual(self.cx.execute(u"42;"), 42) + self.assertEqual(self.cx.execute(u"42.5;"), 42.5) + self.assertEqual(self.cx.execute(u'"spam";'), u"spam") + self.assertEqual(self.cx.execute(u"undefined;"), None) + self.assertEqual(self.cx.execute(u"null;"), None) + self.assertEqual(self.cx.execute(u"true;"), True) + self.assertEqual(self.cx.execute(u"false;"), False) #self.assert_(self.cx.execute("Infinity;") is XXX) #self.assert_(self.cx.execute("NaN;") is XXX) def test_container_types(self): - self.assertEqual(self.cx.execute("[1,2,3];"), [1,2,3]) + self.assertEqual(self.cx.execute(u"[1,2,3];"), [1,2,3]) self.assertEqual(self.cx.execute( - 'var d = {0: 0, "a": 1, 2: "b", "c": "d", "blah": 2.5}; d;'), - {0: 0, "a": 1, 2: "b", "c": "d", "blah": 2.5}) + u'var d = {0: 0, "a": 1, 2: "b", "c": "d", "blah": 2.5}; d;'), + {0: 0, u"a": 1, 2: u"b", u"c": u"d", u"blah": 2.5}) self.assertEqual(self.cx.execute( - '["foo", 2, {"bar": 2.3, "spam": [1,2,3]}];'), - ["foo", 2, {"bar": 2.3, "spam": [1,2,3]}]) \ No newline at end of file + u'["foo", 2, {"bar": 2.3, "spam": [1,2,3]}];'), + [u"foo", 2, {u"bar": 2.3, u"spam": [1,2,3]}]) + +if __name__ == "__main__": + unittest.main() \ No newline at end of file tests/to_python_test.py tests/bind_test.pyc tests/class_test.pyc tests/context_test.pyc tests/define_function_test.pyc tests/error_test.pyc tests/roundtrip_test.pyc tests/to_python_test.pyc f777240d46ec91a8058163d66bccaeed4d176a6b davisp davisp@davis2318.hsd1.ma.comcast.net http://github.com/davisp/python-spidermonkey/commit/e57d094648fd3ccd224c68e8a04a9f0693375b6e e57d094648fd3ccd224c68e8a04a9f0693375b6e 2009-01-30T00:32:01-08:00 2009-01-30T00:32:01-08:00 Unicode enabled python-spidermonkey. Did I really commit *.pyc files before? e6989a56b62fa9fbfb6d2fc7c31c328045e62980 davisp davisp@davis2318.hsd1.ma.comcast.net