traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiling error when missing gdbm version macros (GH-7823)

This commit is contained in:
Xiang Zhang 2018-06-20 21:23:30 +08:00 committed by GitHub
parent 16eb3bcdb2
commit b248e957a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/pythoninfo.py
View File

@ -527,11 +527,11 @@ def collect_cc(info_add):
def collect_gdbm(info_add): def collect_gdbm(info_add):
try: try:
import _gdbm from _gdbm import _GDBM_VERSION
except ImportError: except ImportError:
return return
info_add('gdbm.GDBM_VERSION', '.'.join(map(str, _gdbm._GDBM_VERSION))) info_add('gdbm.GDBM_VERSION', '.'.join(map(str, _GDBM_VERSION)))
def collect_info(info): def collect_info(info):

5
Lib/test/test_dbm_gnu.py
View File

@ -12,9 +12,8 @@ class TestGdbm(unittest.TestCase):
def setUpClass(): def setUpClass():
if support.verbose: if support.verbose:
try: try:
import _gdbm from _gdbm import _GDBM_VERSION as version
version = _gdbm._GDBM_VERSION except ImportError:
except (ImportError, AttributeError):
pass pass
else: else:
print(f"gdbm version: {version}") print(f"gdbm version: {version}")

3
Modules/_gdbmmodule.c
View File

@ -678,6 +678,8 @@ PyInit__gdbm(void) {
goto error; goto error;
} }
#if defined(GDBM_VERSION_MAJOR) && defined(GDBM_VERSION_MINOR) && \
defined(GDBM_VERSION_PATCH)
PyObject *obj = Py_BuildValue("iii", GDBM_VERSION_MAJOR, PyObject *obj = Py_BuildValue("iii", GDBM_VERSION_MAJOR,
GDBM_VERSION_MINOR, GDBM_VERSION_PATCH); GDBM_VERSION_MINOR, GDBM_VERSION_PATCH);
if (obj == NULL) { if (obj == NULL) {
@ -687,6 +689,7 @@ PyInit__gdbm(void) {
Py_DECREF(obj); Py_DECREF(obj);
goto error; goto error;
} }
#endif
return m; return m;