Issue #19288: Fixed the "in" operator of dbm.gnu databases for string
argument. Original patch by Arfrever Frehtes Taifersar Arahesis.
diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py
index bf62946..4fb66c5 100755
--- a/Lib/test/test_dbm_gnu.py
+++ b/Lib/test/test_dbm_gnu.py
@@ -24,6 +24,7 @@
self.g[b'bytes'] = b'data'
key_set = set(self.g.keys())
self.assertEqual(key_set, set([b'a', b'bytes', b'12345678910']))
+ self.assertIn('a', self.g)
self.assertIn(b'a', self.g)
self.assertEqual(self.g[b'bytes'], b'data')
key = self.g.firstkey()
diff --git a/Misc/NEWS b/Misc/NEWS
index b43fa9a..854a4a0 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@
Library
-------
+- Issue #19288: Fixed the "in" operator of dbm.gnu databases for string
+ argument. Original patch by Arfrever Frehtes Taifersar Arahesis.
+
- Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
argument. Original patch by Arfrever Frehtes Taifersar Arahesis.
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
index 474561b..0bd59c8 100644
--- a/Modules/_gdbmmodule.c
+++ b/Modules/_gdbmmodule.c
@@ -290,20 +290,29 @@
{
dbmobject *dp = (dbmobject *)self;
datum key;
+ Py_ssize_t size;
if ((dp)->di_dbm == NULL) {
PyErr_SetString(DbmError,
"GDBM object has already been closed");
return -1;
}
- if (!PyBytes_Check(arg)) {
+ if (PyUnicode_Check(arg)) {
+ key.dptr = PyUnicode_AsUTF8AndSize(arg, &size);
+ key.dsize = size;
+ if (key.dptr == NULL)
+ return -1;
+ }
+ else if (!PyBytes_Check(arg)) {
PyErr_Format(PyExc_TypeError,
- "gdbm key must be bytes, not %.100s",
+ "gdbm key must be bytes or string, not %.100s",
arg->ob_type->tp_name);
return -1;
}
- key.dptr = PyBytes_AS_STRING(arg);
- key.dsize = PyBytes_GET_SIZE(arg);
+ else {
+ key.dptr = PyBytes_AS_STRING(arg);
+ key.dsize = PyBytes_GET_SIZE(arg);
+ }
return gdbm_exists(dp->di_dbm, key);
}