From dc9d1d1a3a96381ae6b7be2ea46840785986ae64 Mon Sep 17 00:00:00 2001 From: Christian Tismer Date: Mon, 29 Jan 2018 17:29:45 +0100 Subject: Fix signature extension disabling The signature extension is a feature that can switch itself off, using the expression PY_VERSION_HEX >= 0x03040000 || \ (PY_VERSION_HEX < 0x03000000 && PY_VERSION_HEX >= 0x02070000) Unfortunately, the use of this constant when disabled became inconsistent over time. This patch corrects that and also adds a cosmetic improvement that was lost. Task-number: PYSIDE-510 Change-Id: Id1653c391d921a2c51008db2bc222d6f4bec9e90 Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Alexandru Croitor --- sources/shiboken2/libshiboken/signature.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sources/shiboken2/libshiboken') diff --git a/sources/shiboken2/libshiboken/signature.cpp b/sources/shiboken2/libshiboken/signature.cpp index fa083111e..2b1447140 100644 --- a/sources/shiboken2/libshiboken/signature.cpp +++ b/sources/shiboken2/libshiboken/signature.cpp @@ -308,7 +308,7 @@ GetSignature_TypeMod(PyObject *ob) } -const char *PySide_PythonCode = (const char *) +static const char PySide_PythonCode[] = "from __future__ import print_function, absolute_import\n" "import sys, os, traceback\n" @@ -632,6 +632,7 @@ SbkSpecial_Type_Ready(PyObject *module, PyTypeObject *type, return ret; } +#if EXTENSION_ENABLED static int PySide_FinishSignatures(PyObject *module, const char *signatures) { @@ -675,6 +676,7 @@ PySide_FinishSignatures(PyObject *module, const char *signatures) #endif return 0; } +#endif // EXTENSION_ENABLED void FinishSignatureInitialization(PyObject *module, const char *signatures) -- cgit v1.2.3