Changeset 86309 in vbox for trunk/src/libs/xpcom18a4/python

Timestamp:

Sep 28, 2020 10:44:15 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140595

Message:

xpcom/python: Use PyUnicode_GetLength instead of deprecated PyUnicode_GetSize for empty string test. Indentation and other minor py3 cleanups. bugref:9840

File:

• trunk/src/libs/xpcom18a4/python/src/VariantUtils.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/python/src/VariantUtils.cpp

@@ -84 +84 @@
         PRUint32 size;
         PyObject *s;
-        void *src;
+        const void *src;
         PRUnichar *dest;
 
@@ -97 +97 @@
         src = PyString_AS_STRING(s) + 2;
 #else
-    if (!PyBytes_Check(s))
-    {
-        PyErr_SetString(PyExc_TypeError, "internal error in PyXPCOM, parameter must be a bytes object");
-        return -1;
-    }
-    size = (PyBytes_GET_SIZE(s) - 2) / sizeof(PRUnichar);
-    src = PyBytes_AS_STRING(s) + 2;
+        if (!PyBytes_Check(s)) {
+                PyErr_SetString(PyExc_TypeError, "internal error in PyXPCOM, parameter must be a bytes object");
+                return -1;
+        }
+        size = (PyBytes_GET_SIZE(s) - 2) / sizeof(PRUnichar);
+        src = PyBytes_AS_STRING(s) + 2;
 #endif
         dest = (PRUnichar *)nsMemory::Alloc(sizeof(PRUnichar) * (size + 1));
@@ -187 +186 @@
                 ok = PR_FALSE;
 #else
-    if (!PyUnicode_Check(val)) {
-        PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
-        ok = PR_FALSE;
-    }
-    val_use = val;
-    Py_INCREF(val_use);
+        if (!PyUnicode_Check(val)) {
+                PyErr_SetString(PyExc_TypeError, "This parameter must be a unicode object");
+                ok = PR_FALSE;
+        }
+        val_use = val;
+        Py_INCREF(val_use);
 #endif
         if (ok) {
@@ -817 +816 @@
                         break;
                 case nsIDataType::VTYPE_STRING_SIZE_IS:
+                {
 #if PY_MAJOR_VERSION <= 2
                         nr = v->SetAsStringWithSize(PyString_Size(ob), PyString_AsString(ob));
 #else
-            Py_ssize_t cb;
-            const char *psz;
-            psz = PyUnicode_AsUTF8AndSize(ob, &cb);
+                        Py_ssize_t cb = 0;
+                        const char *psz = PyUnicode_AsUTF8AndSize(ob, &cb);
                         nr = v->SetAsStringWithSize(cb, psz);
 #endif
                         break;
+                }
                 case nsIDataType::VTYPE_WSTRING_SIZE_IS:
+#if PY_VERSION_HEX >= 0x03030000
+                        if (PyUnicode_GetLength(ob) == 0) {
+#else
                         if (PyUnicode_GetSize(ob) == 0) {
+#endif
                                 nr = v->SetAsWStringWithSize(0, (PRUnichar*)NULL);
-                        }
-                        else {
+                        } else {
                                 PRUint32 nch;
                                 PRUnichar *p;