diff options
| author | Christian Tismer <tismer@stackless.com> | 2018-01-29 17:29:45 +0100 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2018-02-02 10:21:12 +0000 |
| commit | dc9d1d1a3a96381ae6b7be2ea46840785986ae64 (patch) | |
| tree | 6b4ae4e19251d6ab9f95d4801bc42c2a20dd10f1 | |
| parent | c50004a5fec7bebaa957596a91a43959c85da8a5 (diff) | |
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 <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | sources/shiboken2/libshiboken/signature.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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) |