Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string

serhiy-storchaka · serhiy-storchaka · commit 124a0b314bcd · 2013-10-25T00:01:25.000+03:00
argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py
@@ -24,6 +24,7 @@ def test_keys(self):
         self.d[b'bytes'] = b'data'
         self.d['12345678910'] = '019237410982340912840198242'
         self.d.keys()
+        self.assertIn('a', self.d)
         self.assertIn(b'a', self.d)
         self.assertEqual(self.d[b'bytes'], b'data')
         self.d.close()
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ Projected release date: 2013-11-24
 Core and Builtins
 -----------------
 
+- Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
+  argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
+
 - Issue #19369: Optimized the usage of __length_hint__().
 
 - Issue #18603: Ensure that PyOS_mystricmp and PyOS_mystrnicmp are in the
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
@@ -221,9 +221,9 @@ dbm_contains(PyObject *self, PyObject *arg)
         if (key.dptr == NULL)
             return -1;
     }
-    if (!PyBytes_Check(arg)) {
+    else if (!PyBytes_Check(arg)) {
         PyErr_Format(PyExc_TypeError,
-                     "dbm key must be string, not %.100s",
+                     "dbm key must be bytes or string, not %.100s",
                      arg->ob_type->tp_name);
         return -1;
     }

Original file line number	Diff line number	Diff line change
`@@ -221,9 +221,9 @@ dbm_contains(PyObject self, PyObject arg)`
`221`	`221`	`if (key.dptr == NULL)`
`222`	`222`	`return -1;`
`223`	`223`	`}`
`224`		`- if (!PyBytes_Check(arg)) {`
	`224`	`+ else if (!PyBytes_Check(arg)) {`
`225`	`225`	`PyErr_Format(PyExc_TypeError,`
`226`		`- "dbm key must be string, not %.100s",`
	`226`	`+ "dbm key must be bytes or string, not %.100s",`
`227`	`227`	`arg->ob_type->tp_name);`
`228`	`228`	`return -1;`
`229`	`229`	`}`