diff options
| -rw-r--r-- | Lib/test/pythoninfo.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_dbm_gnu.py | 11 | ||||
| -rw-r--r-- | Modules/_gdbmmodule.c | 39 |
3 files changed, 52 insertions, 8 deletions
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 9242a36bed..3958764a6a 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -525,6 +525,15 @@ def collect_cc(info_add): info_add('CC.version', text) +def collect_gdbm(info_add): + try: + import _gdbm + except ImportError: + return + + info_add('gdbm.GDBM_VERSION', '.'.join(map(str, _gdbm._GDBM_VERSION))) + + def collect_info(info): error = False info_add = info.add @@ -552,6 +561,7 @@ def collect_info(info): collect_testcapi, collect_resource, collect_cc, + collect_gdbm, # Collecting from tests should be last as they have side effects. collect_test_socket, diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py index 379601ad86..49f91705b5 100644 --- a/Lib/test/test_dbm_gnu.py +++ b/Lib/test/test_dbm_gnu.py @@ -8,6 +8,17 @@ from test.support import TESTFN, TESTFN_NONASCII, unlink filename = TESTFN class TestGdbm(unittest.TestCase): + @staticmethod + def setUpClass(): + if support.verbose: + try: + import _gdbm + version = _gdbm._GDBM_VERSION + except (ImportError, AttributeError): + pass + else: + print(f"gdbm version: {version}") + def setUp(self): self.g = None diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index 9996d8c26f..a68cf02942 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -654,20 +654,43 @@ static struct PyModuleDef _gdbmmodule = { PyMODINIT_FUNC PyInit__gdbm(void) { - PyObject *m, *d, *s; + PyObject *m; if (PyType_Ready(&Dbmtype) < 0) return NULL; m = PyModule_Create(&_gdbmmodule); - if (m == NULL) + if (m == NULL) { return NULL; - d = PyModule_GetDict(m); + } + DbmError = PyErr_NewException("_gdbm.error", PyExc_OSError, NULL); - if (DbmError != NULL) { - PyDict_SetItemString(d, "error", DbmError); - s = PyUnicode_FromString(dbmmodule_open_flags); - PyDict_SetItemString(d, "open_flags", s); - Py_DECREF(s); + if (DbmError == NULL) { + goto error; + } + Py_INCREF(DbmError); + if (PyModule_AddObject(m, "error", DbmError) < 0) { + Py_DECREF(DbmError); + goto error; + } + + if (PyModule_AddStringConstant(m, "open_flags", + dbmmodule_open_flags) < 0) { + goto error; } + + PyObject *obj = Py_BuildValue("iii", GDBM_VERSION_MAJOR, + GDBM_VERSION_MINOR, GDBM_VERSION_PATCH); + if (obj == NULL) { + goto error; + } + if (PyModule_AddObject(m, "_GDBM_VERSION", obj) < 0) { + Py_DECREF(obj); + goto error; + } + return m; + +error: + Py_DECREF(m); + return NULL; } |