Skip to content

Commit 8b5cb61

Browse files
committed
Deal with SEGV for some Python3.14 versions
1 parent 3c15db4 commit 8b5cb61

6 files changed

Lines changed: 10 additions & 12 deletions

File tree

code/ibmmq/ibmmqc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1932,7 +1932,7 @@ PyMODINIT_FUNC PyInit_ibmmqc(void) {
19321932

19331933
// And now add this map to the parent object
19341934
PyDict_SetItemString(d,"__strucversions__", v);
1935-
Py_XDECREF(v);
1935+
// Py_XDECREF(v);
19361936

19371937
/*
19381938
* Set the client/server build flag - always "common" now as there is no

code/ibmmq/mqqargs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def common_q_args(*opts):
3030

3131

3232
# Backward compatibility
33-
commonQArgs = common_q_args
33+
commonQArgs = common_q_args # pylint: disable=invalid-name
3434

3535
# Some support functions for Queue ops.
3636
def _make_q_desc(qdesc_or_string: Union[str, bytes, OD]) -> OD:

code/tests/runContainer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ $cmd run \
129129
--env MQ_ENABLE_EMBEDDED_WEB_SERVER=false \
130130
--env AMQ_IODELAY=5000000 \
131131
-v $volume:/var/mqm \
132+
--detach \
132133
$secretLines \
133134
--publish $publicPort:1414 \
134-
--detach \
135135
$c
136136

137137
sleep 5

code/tests/test_pubsub.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
"""Test the PubSub verbs"""
22

3-
import sys
43
import unicodedata
54
import unittest
65
import ibmmq as mq
76
import utils
87
import config
98

10-
if sys.version_info[0] >= 3:
11-
def unicode(x, encoding):
12-
"""Turn Python3 strings into bytes"""
13-
if isinstance(x, bytes):
14-
return x.decode(encoding)
15-
return str(x) # In py 3 every string is unicode.
9+
def unicode(x, encoding):
10+
"""Turn Python3 strings into bytes"""
11+
if isinstance(x, bytes):
12+
return x.decode(encoding)
13+
return str(x) # In py 3 every string is unicode.
1614

1715
# pylint: disable=missing-function-docstring
1816

pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ source-roots=
106106

107107
# When enabled, pylint would attempt to guess common misconfiguration and emit
108108
# user-friendly hints instead of false-positive error messages.
109-
suggestion-mode=yes
109+
# suggestion-mode=yes
110110

111111
# Allow loading of arbitrary C extensions. Extensions are imported into the
112112
# active Python interpreter and may run arbitrary code.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# The version should correspond to PEP440 and gets normalised if
1818
# not in the right format. VRM can be followed with a|b|rc with a further numeric
1919
# to indicate alpha/beta/release-candidate versions.
20-
VERSION = '2.0.3'
20+
VERSION = '2.0.4'
2121

2222
_ABI_LIMITS = {
2323
# Minimum Python version that this package supports.

0 commit comments

Comments
 (0)