From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 24 Oct 2013 20:59:28 +0000 (+0300)
Subject: Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
X-Git-Tag: v3.3.3rc1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9da33ab193803922141f654f6d3cccdaed6b4866;p=python

Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
---

diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py
index f9d3befde9..b57e1f0653 100755
--- a/Lib/test/test_dbm_ndbm.py
+++ b/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()
diff --git a/Misc/NEWS b/Misc/NEWS
index c05bffc882..b43fa9a058 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -81,6 +81,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #19287: Fixed the "in" operator of dbm.ndbm databases for string
+  argument.  Original patch by Arfrever Frehtes Taifersar Arahesis.
+
 - Issue #19327: Fixed the working of regular expressions with too big charset.
 
 - Issue #19350: Increasing the test coverage of macurl2path. Patch by Colin
diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c
index 327b8730c2..83c051c505 100644
--- a/Modules/_dbmmodule.c
+++ b/Modules/_dbmmodule.c
@@ -225,9 +225,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;
     }