diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-06-27 12:11:14 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-07-05 23:14:52 +0200 |
| commit | 4a3706db4fa737ea0047a3605312591698392617 (patch) | |
| tree | 69f36ef836d9056dd107319921de4275ff22f54c /external | |
| parent | e4cbe169bd1236698a573bf4758d8ae8519a1c08 (diff) | |
pyuno: fix deprecated warnings
* Replace PyUnicode_FromUnicode(str, len) with PyUnicode_FromWideChar(str, len)
* Replace PyUnicode_AS_UNICODE(PyObject) with PyUnicode_AsWideCharString(PyObject, size)
Change-Id: I1d8b46059d72f4de261d99393e1681f1e41eafdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169625
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 1 | ||||
| -rw-r--r-- | external/python3/py_deprecated_warning.patch.0 | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 5822940e9924..4b1ae232a3cb 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/python-3.7.6-msvc-ssl.patch.1 \ external/python3/python-3.5.4-msvc-disable.patch.1 \ external/python3/ubsan.patch.0 \ - external/python3/py_deprecated_warning.patch.0 \ external/python3/python-3.5.tweak.strip.soabi.patch \ external/python3/darwin.patch.0 \ external/python3/macos-11.patch.0 \ diff --git a/external/python3/py_deprecated_warning.patch.0 b/external/python3/py_deprecated_warning.patch.0 deleted file mode 100644 index 2deefa6e531f..000000000000 --- a/external/python3/py_deprecated_warning.patch.0 +++ /dev/null @@ -1,20 +0,0 @@ ---- Include/cpython/unicodeobject.h 2024-06-10 10:53:20.049824821 +0200 -+++ Include/cpython/unicodeobject.h 2024-06-10 10:54:50.776970835 +0200 -@@ -548,7 +548,7 @@ - only allowed if u was set to NULL. - - The buffer is copied into the new object. */ --Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode( -+/*Py_DEPRECATED(3.3)*/ PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode( - const Py_UNICODE *u, /* Unicode buffer */ - Py_ssize_t size /* size of buffer */ - ); -@@ -577,7 +577,7 @@ - Py_UNICODE buffer. - If the wchar_t/Py_UNICODE representation is not yet available, this - function will calculate it. */ --Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( -+/*Py_DEPRECATED(3.3)*/ PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( - PyObject *unicode /* Unicode object */ - ); - |