Browse Source

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

argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
pull/224/head
Serhiy Storchaka 13 years ago
parent
commit
124a0b314b
  1. 1
      Lib/test/test_dbm_ndbm.py
  2. 3
      Misc/NEWS
  3. 4
      Modules/_dbmmodule.c

1
Lib/test/test_dbm_ndbm.py

@ -24,6 +24,7 @@ class DbmTestCase(unittest.TestCase):
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()

3
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

4
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;
}

Loading…
Cancel
Save