Mailman 3 April 2018 - Python-checkins

bpo-31026: Fix test_dbm if dbm.ndbm is build with Berkeley DB. (GH-6632)
by Serhiy Storchaka April 29, 2018

April 29, 2018

https://github.com/python/cpython/commit/70af06cdc4e8fbee0b9d7d46bdc193097d… commit: 70af06cdc4e8fbee0b9d7d46bdc193097d4bc71f branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-29T15:45:03+03:00 summary: bpo-31026: Fix test_dbm if dbm.ndbm is build with Berkeley DB. (GH-6632) files: M Lib/test/test_dbm.py M Lib/test/test_dbm_ndbm.py diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index fb8980780f1d..… [View More]78c32c4c93d3 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -38,8 +38,7 @@ def delete_files(): class AnyDBMTestCase: - _dict = {'0': b'', - 'a': b'Python:', + _dict = {'a': b'Python:', 'b': b'Programming', 'c': b'the', 'd': b'way', @@ -109,6 +108,20 @@ def test_anydbm_keys(self): keys = self.keys_helper(f) f.close() + def test_empty_value(self): + if getattr(dbm._defaultmod, 'library', None) == 'Berkeley DB': + self.skipTest("Berkeley DB doesn't distinguish the empty value " + "from the absent one") + f = dbm.open(_fname, 'c') + self.assertEqual(f.keys(), []) + f[b'empty'] = b'' + self.assertEqual(f.keys(), [b'empty']) + self.assertIn(b'empty', f) + self.assertEqual(f[b'empty'], b'') + self.assertEqual(f.get(b'empty'), b'') + self.assertEqual(f.setdefault(b'empty'), b'') + f.close() + def test_anydbm_access(self): self.init_db() f = dbm.open(_fname, 'r') diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py index f921167ca463..49b88f5cccef 100644 --- a/Lib/test/test_dbm_ndbm.py +++ b/Lib/test/test_dbm_ndbm.py @@ -36,6 +36,20 @@ def test_keys(self): self.assertEqual(self.d[b'xxx'], b'foo') self.d.close() + def test_empty_value(self): + if dbm.ndbm.library == 'Berkeley DB': + self.skipTest("Berkeley DB doesn't distinguish the empty value " + "from the absent one") + self.d = dbm.ndbm.open(self.filename, 'c') + self.assertEqual(self.d.keys(), []) + self.d['empty'] = '' + self.assertEqual(self.d.keys(), [b'empty']) + self.assertIn(b'empty', self.d) + self.assertEqual(self.d[b'empty'], b'') + self.assertEqual(self.d.get(b'empty'), b'') + self.assertEqual(self.d.setdefault(b'empty'), b'') + self.d.close() + def test_modes(self): for mode in ['r', 'rw', 'w', 'n']: try: [View Less]

1 0

[3.6] bpo-33383: Fix crash in get() of the dbm.ndbm database object. (GH-6630). (GH-6633)
by Serhiy Storchaka April 29, 2018

April 29, 2018

https://github.com/python/cpython/commit/1b27ec6e0b40f81bf276eefa6b5bdb773b… commit: 1b27ec6e0b40f81bf276eefa6b5bdb773b2a8890 branch: 3.6 author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-29T15:44:16+03:00 summary: [3.6] bpo-33383: Fix crash in get() of the dbm.ndbm database object. (GH-6630). (GH-6633) (cherry picked from commit 2e38cc39330bd7f3003652869b644110a97a78d8) files: A Misc/NEWS.d/next/Library/2018-04-29-11-15-38.… [View More]bpo-33383.g32YWn.rst M Lib/test/test_dbm.py M Lib/test/test_dbm_dumb.py M Lib/test/test_dbm_gnu.py M Lib/test/test_dbm_ndbm.py M Modules/_dbmmodule.c M Modules/clinic/_dbmmodule.c.h diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index f0a428deaf09..fb8980780f1d 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -86,12 +86,21 @@ def test_anydbm_modification(self): f = dbm.open(_fname, 'c') self._dict['g'] = f[b'g'] = b"indented" self.read_helper(f) + # setdefault() works as in the dict interface + self.assertEqual(f.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(f[b'xxx'], b'foo') f.close() def test_anydbm_read(self): self.init_db() f = dbm.open(_fname, 'r') self.read_helper(f) + # get() works as in the dict interface + self.assertEqual(f.get(b'a'), self._dict['a']) + self.assertEqual(f.get(b'xxx', b'foo'), b'foo') + self.assertIsNone(f.get(b'xxx')) + with self.assertRaises(KeyError): + f[b'xxx'] f.close() def test_anydbm_keys(self): diff --git a/Lib/test/test_dbm_dumb.py b/Lib/test/test_dbm_dumb.py index 2606ba78eb55..58173a20a571 100644 --- a/Lib/test/test_dbm_dumb.py +++ b/Lib/test/test_dbm_dumb.py @@ -74,6 +74,9 @@ def test_dumbdbm_modification(self): f = dumbdbm.open(_fname, 'w') self._dict[b'g'] = f[b'g'] = b"indented" self.read_helper(f) + # setdefault() works as in the dict interface + self.assertEqual(f.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(f[b'xxx'], b'foo') f.close() def test_dumbdbm_read(self): @@ -86,6 +89,12 @@ def test_dumbdbm_read(self): with self.assertWarnsRegex(DeprecationWarning, 'The database is opened for reading only'): del f[b'a'] + # get() works as in the dict interface + self.assertEqual(f.get(b'b'), self._dict[b'b']) + self.assertEqual(f.get(b'xxx', b'foo'), b'foo') + self.assertIsNone(f.get(b'xxx')) + with self.assertRaises(KeyError): + f[b'xxx'] f.close() def test_dumbdbm_keys(self): diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py index d96df9284806..463d34341155 100644 --- a/Lib/test/test_dbm_gnu.py +++ b/Lib/test/test_dbm_gnu.py @@ -32,9 +32,12 @@ def test_key_methods(self): self.assertIn(key, key_set) key_set.remove(key) key = self.g.nextkey(key) - self.assertRaises(KeyError, lambda: self.g['xxx']) # get() and setdefault() work as in the dict interface + self.assertEqual(self.g.get(b'a'), b'b') + self.assertIsNone(self.g.get(b'xxx')) self.assertEqual(self.g.get(b'xxx', b'foo'), b'foo') + with self.assertRaises(KeyError): + self.g['xxx'] self.assertEqual(self.g.setdefault(b'xxx', b'foo'), b'foo') self.assertEqual(self.g[b'xxx'], b'foo') diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py index fb7d0e8281e3..f921167ca463 100644 --- a/Lib/test/test_dbm_ndbm.py +++ b/Lib/test/test_dbm_ndbm.py @@ -18,7 +18,7 @@ def tearDown(self): def test_keys(self): self.d = dbm.ndbm.open(self.filename, 'c') - self.assertTrue(self.d.keys() == []) + self.assertEqual(self.d.keys(), []) self.d['a'] = 'b' self.d[b'bytes'] = b'data' self.d['12345678910'] = '019237410982340912840198242' @@ -26,6 +26,14 @@ def test_keys(self): self.assertIn('a', self.d) self.assertIn(b'a', self.d) self.assertEqual(self.d[b'bytes'], b'data') + # get() and setdefault() work as in the dict interface + self.assertEqual(self.d.get(b'a'), b'b') + self.assertIsNone(self.d.get(b'xxx')) + self.assertEqual(self.d.get(b'xxx', b'foo'), b'foo') + with self.assertRaises(KeyError): + self.d['xxx'] + self.assertEqual(self.d.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(self.d[b'xxx'], b'foo') self.d.close() def test_modes(self): diff --git a/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst b/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst new file mode 100644 index 000000000000..7b65baac97bf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst @@ -0,0 +1,2 @@ +Fixed crash in the get() method of the :mod:`dbm.ndbm` database object when +it is called with a single argument. diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index 842953679698..2fe1de77e1a8 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -275,7 +275,7 @@ static PySequenceMethods dbm_as_sequence = { _dbm.dbm.get key: str(accept={str, robuffer}, zeroes=True) - default: object(c_default="NULL") = b'' + default: object = None / Return the value for key if present, otherwise default. @@ -284,7 +284,7 @@ Return the value for key if present, otherwise default. static PyObject * _dbm_dbm_get_impl(dbmobject *self, const char *key, Py_ssize_clean_t key_length, PyObject *default_value) -/*[clinic end generated code: output=b44f95eba8203d93 input=a3a279957f85eb6d]*/ +/*[clinic end generated code: output=b44f95eba8203d93 input=b788eba0ffad2e91]*/ /*[clinic end generated code: output=4f5c0e523eaf1251 input=9402c0af8582dc69]*/ { datum dbm_key, val; diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h index 7dd529a50c61..9a35311d19c8 100644 --- a/Modules/clinic/_dbmmodule.c.h +++ b/Modules/clinic/_dbmmodule.c.h @@ -39,7 +39,7 @@ _dbm_dbm_keys(dbmobject *self, PyObject *Py_UNUSED(ignored)) } PyDoc_STRVAR(_dbm_dbm_get__doc__, -"get($self, key, default=b\'\', /)\n" +"get($self, key, default=None, /)\n" "--\n" "\n" "Return the value for key if present, otherwise default."); @@ -57,7 +57,7 @@ _dbm_dbm_get(dbmobject *self, PyObject *args) PyObject *return_value = NULL; const char *key; Py_ssize_clean_t key_length; - PyObject *default_value = NULL; + PyObject *default_value = Py_None; if (!PyArg_ParseTuple(args, "s#|O:get", &key, &key_length, &default_value)) { @@ -141,4 +141,4 @@ dbmopen(PyObject *module, PyObject *args) exit: return return_value; } -/*[clinic end generated code: output=001fabffcecb99f1 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=919cc4337be4a5d3 input=a9049054013a1b77]*/ [View Less]

1 0

[3.7] bpo-33383: Fix crash in get() of the dbm.ndbm database object. (GH-6630) (GH-6631)
by Serhiy Storchaka April 29, 2018

April 29, 2018

https://github.com/python/cpython/commit/ee95feb69d937149bef3d245e87df1aef4… commit: ee95feb69d937149bef3d245e87df1aef412b7fc branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-04-29T14:50:26+03:00 summary: [3.7] bpo-33383: Fix crash in get() of the dbm.ndbm database object. (GH-6630) (GH-6631) (cherry picked from commit 2e38cc39330bd7f3003652869b644110a97a78d8) Co-authored-… [View More]by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst M Lib/test/test_dbm.py M Lib/test/test_dbm_dumb.py M Lib/test/test_dbm_gnu.py M Lib/test/test_dbm_ndbm.py M Modules/_dbmmodule.c M Modules/clinic/_dbmmodule.c.h diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index f0a428deaf09..fb8980780f1d 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -86,12 +86,21 @@ def test_anydbm_modification(self): f = dbm.open(_fname, 'c') self._dict['g'] = f[b'g'] = b"indented" self.read_helper(f) + # setdefault() works as in the dict interface + self.assertEqual(f.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(f[b'xxx'], b'foo') f.close() def test_anydbm_read(self): self.init_db() f = dbm.open(_fname, 'r') self.read_helper(f) + # get() works as in the dict interface + self.assertEqual(f.get(b'a'), self._dict['a']) + self.assertEqual(f.get(b'xxx', b'foo'), b'foo') + self.assertIsNone(f.get(b'xxx')) + with self.assertRaises(KeyError): + f[b'xxx'] f.close() def test_anydbm_keys(self): diff --git a/Lib/test/test_dbm_dumb.py b/Lib/test/test_dbm_dumb.py index fa14238d848d..7f5c09f2fe55 100644 --- a/Lib/test/test_dbm_dumb.py +++ b/Lib/test/test_dbm_dumb.py @@ -73,6 +73,9 @@ def test_dumbdbm_modification(self): f = dumbdbm.open(_fname, 'w') self._dict[b'g'] = f[b'g'] = b"indented" self.read_helper(f) + # setdefault() works as in the dict interface + self.assertEqual(f.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(f[b'xxx'], b'foo') f.close() def test_dumbdbm_read(self): @@ -85,6 +88,12 @@ def test_dumbdbm_read(self): with self.assertWarnsRegex(DeprecationWarning, 'The database is opened for reading only'): del f[b'a'] + # get() works as in the dict interface + self.assertEqual(f.get(b'b'), self._dict[b'b']) + self.assertEqual(f.get(b'xxx', b'foo'), b'foo') + self.assertIsNone(f.get(b'xxx')) + with self.assertRaises(KeyError): + f[b'xxx'] f.close() def test_dumbdbm_keys(self): diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py index d96df9284806..463d34341155 100644 --- a/Lib/test/test_dbm_gnu.py +++ b/Lib/test/test_dbm_gnu.py @@ -32,9 +32,12 @@ def test_key_methods(self): self.assertIn(key, key_set) key_set.remove(key) key = self.g.nextkey(key) - self.assertRaises(KeyError, lambda: self.g['xxx']) # get() and setdefault() work as in the dict interface + self.assertEqual(self.g.get(b'a'), b'b') + self.assertIsNone(self.g.get(b'xxx')) self.assertEqual(self.g.get(b'xxx', b'foo'), b'foo') + with self.assertRaises(KeyError): + self.g['xxx'] self.assertEqual(self.g.setdefault(b'xxx', b'foo'), b'foo') self.assertEqual(self.g[b'xxx'], b'foo') diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py index fb7d0e8281e3..f921167ca463 100644 --- a/Lib/test/test_dbm_ndbm.py +++ b/Lib/test/test_dbm_ndbm.py @@ -18,7 +18,7 @@ def tearDown(self): def test_keys(self): self.d = dbm.ndbm.open(self.filename, 'c') - self.assertTrue(self.d.keys() == []) + self.assertEqual(self.d.keys(), []) self.d['a'] = 'b' self.d[b'bytes'] = b'data' self.d['12345678910'] = '019237410982340912840198242' @@ -26,6 +26,14 @@ def test_keys(self): self.assertIn('a', self.d) self.assertIn(b'a', self.d) self.assertEqual(self.d[b'bytes'], b'data') + # get() and setdefault() work as in the dict interface + self.assertEqual(self.d.get(b'a'), b'b') + self.assertIsNone(self.d.get(b'xxx')) + self.assertEqual(self.d.get(b'xxx', b'foo'), b'foo') + with self.assertRaises(KeyError): + self.d['xxx'] + self.assertEqual(self.d.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(self.d[b'xxx'], b'foo') self.d.close() def test_modes(self): diff --git a/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst b/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst new file mode 100644 index 000000000000..7b65baac97bf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst @@ -0,0 +1,2 @@ +Fixed crash in the get() method of the :mod:`dbm.ndbm` database object when +it is called with a single argument. diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index 8afd92cf3ca8..65761d83d380 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -274,7 +274,7 @@ static PySequenceMethods dbm_as_sequence = { _dbm.dbm.get key: str(accept={str, robuffer}, zeroes=True) - default: object(c_default="NULL") = b'' + default: object = None / Return the value for key if present, otherwise default. @@ -283,7 +283,7 @@ Return the value for key if present, otherwise default. static PyObject * _dbm_dbm_get_impl(dbmobject *self, const char *key, Py_ssize_clean_t key_length, PyObject *default_value) -/*[clinic end generated code: output=b44f95eba8203d93 input=a3a279957f85eb6d]*/ +/*[clinic end generated code: output=b44f95eba8203d93 input=b788eba0ffad2e91]*/ /*[clinic end generated code: output=4f5c0e523eaf1251 input=9402c0af8582dc69]*/ { datum dbm_key, val; diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h index 0f831c9eec72..574cc5ee174b 100644 --- a/Modules/clinic/_dbmmodule.c.h +++ b/Modules/clinic/_dbmmodule.c.h @@ -39,7 +39,7 @@ _dbm_dbm_keys(dbmobject *self, PyObject *Py_UNUSED(ignored)) } PyDoc_STRVAR(_dbm_dbm_get__doc__, -"get($self, key, default=b\'\', /)\n" +"get($self, key, default=None, /)\n" "--\n" "\n" "Return the value for key if present, otherwise default."); @@ -57,7 +57,7 @@ _dbm_dbm_get(dbmobject *self, PyObject *const *args, Py_ssize_t nargs) PyObject *return_value = NULL; const char *key; Py_ssize_clean_t key_length; - PyObject *default_value = NULL; + PyObject *default_value = Py_None; if (!_PyArg_ParseStack(args, nargs, "s#|O:get", &key, &key_length, &default_value)) { @@ -141,4 +141,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=5c858b4080a011a4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1cba297bc8d7c2c2 input=a9049054013a1b77]*/ [View Less]

1 0

bpo-33383: Fix crash in get() of the dbm.ndbm database object. (#6630)
by Serhiy Storchaka April 29, 2018

April 29, 2018

https://github.com/python/cpython/commit/2e38cc39330bd7f3003652869b644110a9… commit: 2e38cc39330bd7f3003652869b644110a97a78d8 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2018-04-29T12:38:06+03:00 summary: bpo-33383: Fix crash in get() of the dbm.ndbm database object. (#6630) files: A Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst M Lib/test/test_dbm.py M Lib/test/test_dbm_dumb.py M Lib/test/… [View More]test_dbm_gnu.py M Lib/test/test_dbm_ndbm.py M Modules/_dbmmodule.c M Modules/clinic/_dbmmodule.c.h diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py index f0a428deaf09..fb8980780f1d 100644 --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -86,12 +86,21 @@ def test_anydbm_modification(self): f = dbm.open(_fname, 'c') self._dict['g'] = f[b'g'] = b"indented" self.read_helper(f) + # setdefault() works as in the dict interface + self.assertEqual(f.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(f[b'xxx'], b'foo') f.close() def test_anydbm_read(self): self.init_db() f = dbm.open(_fname, 'r') self.read_helper(f) + # get() works as in the dict interface + self.assertEqual(f.get(b'a'), self._dict['a']) + self.assertEqual(f.get(b'xxx', b'foo'), b'foo') + self.assertIsNone(f.get(b'xxx')) + with self.assertRaises(KeyError): + f[b'xxx'] f.close() def test_anydbm_keys(self): diff --git a/Lib/test/test_dbm_dumb.py b/Lib/test/test_dbm_dumb.py index 652a355d990b..58b9d1746568 100644 --- a/Lib/test/test_dbm_dumb.py +++ b/Lib/test/test_dbm_dumb.py @@ -73,6 +73,9 @@ def test_dumbdbm_modification(self): f = dumbdbm.open(_fname, 'w') self._dict[b'g'] = f[b'g'] = b"indented" self.read_helper(f) + # setdefault() works as in the dict interface + self.assertEqual(f.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(f[b'xxx'], b'foo') f.close() def test_dumbdbm_read(self): @@ -85,6 +88,12 @@ def test_dumbdbm_read(self): with self.assertRaisesRegex(ValueError, 'The database is opened for reading only'): del f[b'a'] + # get() works as in the dict interface + self.assertEqual(f.get(b'a'), self._dict[b'a']) + self.assertEqual(f.get(b'xxx', b'foo'), b'foo') + self.assertIsNone(f.get(b'xxx')) + with self.assertRaises(KeyError): + f[b'xxx'] f.close() def test_dumbdbm_keys(self): diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py index d96df9284806..463d34341155 100644 --- a/Lib/test/test_dbm_gnu.py +++ b/Lib/test/test_dbm_gnu.py @@ -32,9 +32,12 @@ def test_key_methods(self): self.assertIn(key, key_set) key_set.remove(key) key = self.g.nextkey(key) - self.assertRaises(KeyError, lambda: self.g['xxx']) # get() and setdefault() work as in the dict interface + self.assertEqual(self.g.get(b'a'), b'b') + self.assertIsNone(self.g.get(b'xxx')) self.assertEqual(self.g.get(b'xxx', b'foo'), b'foo') + with self.assertRaises(KeyError): + self.g['xxx'] self.assertEqual(self.g.setdefault(b'xxx', b'foo'), b'foo') self.assertEqual(self.g[b'xxx'], b'foo') diff --git a/Lib/test/test_dbm_ndbm.py b/Lib/test/test_dbm_ndbm.py index fb7d0e8281e3..f921167ca463 100644 --- a/Lib/test/test_dbm_ndbm.py +++ b/Lib/test/test_dbm_ndbm.py @@ -18,7 +18,7 @@ def tearDown(self): def test_keys(self): self.d = dbm.ndbm.open(self.filename, 'c') - self.assertTrue(self.d.keys() == []) + self.assertEqual(self.d.keys(), []) self.d['a'] = 'b' self.d[b'bytes'] = b'data' self.d['12345678910'] = '019237410982340912840198242' @@ -26,6 +26,14 @@ def test_keys(self): self.assertIn('a', self.d) self.assertIn(b'a', self.d) self.assertEqual(self.d[b'bytes'], b'data') + # get() and setdefault() work as in the dict interface + self.assertEqual(self.d.get(b'a'), b'b') + self.assertIsNone(self.d.get(b'xxx')) + self.assertEqual(self.d.get(b'xxx', b'foo'), b'foo') + with self.assertRaises(KeyError): + self.d['xxx'] + self.assertEqual(self.d.setdefault(b'xxx', b'foo'), b'foo') + self.assertEqual(self.d[b'xxx'], b'foo') self.d.close() def test_modes(self): diff --git a/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst b/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst new file mode 100644 index 000000000000..7b65baac97bf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-04-29-11-15-38.bpo-33383.g32YWn.rst @@ -0,0 +1,2 @@ +Fixed crash in the get() method of the :mod:`dbm.ndbm` database object when +it is called with a single argument. diff --git a/Modules/_dbmmodule.c b/Modules/_dbmmodule.c index 8afd92cf3ca8..65761d83d380 100644 --- a/Modules/_dbmmodule.c +++ b/Modules/_dbmmodule.c @@ -274,7 +274,7 @@ static PySequenceMethods dbm_as_sequence = { _dbm.dbm.get key: str(accept={str, robuffer}, zeroes=True) - default: object(c_default="NULL") = b'' + default: object = None / Return the value for key if present, otherwise default. @@ -283,7 +283,7 @@ Return the value for key if present, otherwise default. static PyObject * _dbm_dbm_get_impl(dbmobject *self, const char *key, Py_ssize_clean_t key_length, PyObject *default_value) -/*[clinic end generated code: output=b44f95eba8203d93 input=a3a279957f85eb6d]*/ +/*[clinic end generated code: output=b44f95eba8203d93 input=b788eba0ffad2e91]*/ /*[clinic end generated code: output=4f5c0e523eaf1251 input=9402c0af8582dc69]*/ { datum dbm_key, val; diff --git a/Modules/clinic/_dbmmodule.c.h b/Modules/clinic/_dbmmodule.c.h index 0f831c9eec72..574cc5ee174b 100644 --- a/Modules/clinic/_dbmmodule.c.h +++ b/Modules/clinic/_dbmmodule.c.h @@ -39,7 +39,7 @@ _dbm_dbm_keys(dbmobject *self, PyObject *Py_UNUSED(ignored)) } PyDoc_STRVAR(_dbm_dbm_get__doc__, -"get($self, key, default=b\'\', /)\n" +"get($self, key, default=None, /)\n" "--\n" "\n" "Return the value for key if present, otherwise default."); @@ -57,7 +57,7 @@ _dbm_dbm_get(dbmobject *self, PyObject *const *args, Py_ssize_t nargs) PyObject *return_value = NULL; const char *key; Py_ssize_clean_t key_length; - PyObject *default_value = NULL; + PyObject *default_value = Py_None; if (!_PyArg_ParseStack(args, nargs, "s#|O:get", &key, &key_length, &default_value)) { @@ -141,4 +141,4 @@ dbmopen(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: return return_value; } -/*[clinic end generated code: output=5c858b4080a011a4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=1cba297bc8d7c2c2 input=a9049054013a1b77]*/ [View Less]

1 0

Daily reference leaks (4243df51fe43): sum=12
by solipsis＠pitrou.net April 29, 2018

April 29, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [0, 0, 7] memory blocks, sum=7 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_spawn leaked [1, -2, 2] memory blocks, sum=1 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogdWB_v8', '--timeout', '7200']

1 0

bpo-33378: Add Korean to the language switcher. (GH-6627)
by Miss Islington (bot) April 28, 2018

April 28, 2018

https://github.com/python/cpython/commit/1487c37e7e85e7221adc3030f0f7de023c… commit: 1487c37e7e85e7221adc3030f0f7de023cc99ced branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-28T13:23:45-07:00 summary: bpo-33378: Add Korean to the language switcher. (GH-6627) (cherry picked from commit 577948329976985ea9bef23d9a6c3dd7108211bf) Co-authored-by: Dong-hee Na <donghee.na92(a)gmail.… [View More]

1 0

bpo-33378: Add Korean to the language switcher. (GH-6627)
by Julien Palard April 28, 2018

April 28, 2018

https://github.com/python/cpython/commit/577948329976985ea9bef23d9a6c3dd710… commit: 577948329976985ea9bef23d9a6c3dd7108211bf branch: master author: Dong-hee Na <donghee.na92(a)gmail.com> committer: Julien Palard <julien(a)palard.fr> date: 2018-04-28T22:08:22+02:00 summary: bpo-33378: Add Korean to the language switcher. (GH-6627) files: A Misc/NEWS.d/next/Documentation/2018-04-29-04-02-18.bpo-33378.-anAHN.rst M Doc/tools/static/switchers.js diff --git a/Doc/tools/static/… [View More]

1 0

Daily reference leaks (4243df51fe43): sum=4
by solipsis＠pitrou.net April 28, 2018

April 28, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [0, 7, -7] memory blocks, sum=0 test_functools leaked [0, 3, 1] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogOWYMo3', '--timeout', '7200']

1 0

Change "non-local state" to "content-local state". (GH-6617)
by Miss Islington (bot) April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/b94d7396b6b313b3dcd17880427a2e9cd9… commit: b94d7396b6b313b3dcd17880427a2e9cd95cf27d branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-04-27T15:57:59-07:00 summary: Change "non-local state" to "content-local state". (GH-6617) The wording here seems wrong, as per https://bugs.python.org/msg315792 (cherry picked from commit … [View More]

1 0

Change "non-local state" to "content-local state". (GH-6617)
by Yury Selivanov April 27, 2018

April 27, 2018

https://github.com/python/cpython/commit/e022bbc169ca1428dc3017187012de17ce… commit: e022bbc169ca1428dc3017187012de17ce6e0bc7 branch: master author: Tom Christie <tom(a)tomchristie.com> committer: Yury Selivanov <yury(a)magic.io> date: 2018-04-27T18:35:13-04:00 summary: Change "non-local state" to "content-local state". (GH-6617) The wording here seems wrong, as per https://bugs.python.org/msg315792 files: M Doc/library/contextvars.rst diff --git a/Doc/library/contextvars.rst b/… [View More]

1 0