From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 20 Sep 2025 08:01:44 +0000 (+0300)
Subject: Revert "gh-66234: Add flag to disable the use of mmap in dbm.gnu (GH-135005)" (GH... 
X-Git-Tag: v3.15.0a1~248
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20d5494c88985beb925b557ec29937b05e54779c;p=thirdparty%2FPython%2Fcpython.git

Revert "gh-66234: Add flag to disable the use of mmap in dbm.gnu (GH-135005)" (GH-136989)

This reverts commit 0cec424af5904b3d23ad6e3c6d1a27f89d238d64.
---

diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst
index 140ca5c1e340..7b7ac2df126b 100644
--- a/Doc/library/dbm.rst
+++ b/Doc/library/dbm.rst
@@ -275,9 +275,6 @@ functionality like crash tolerance.
       * ``'s'``: Synchronized mode.
         Changes to the database will be written immediately to the file.
       * ``'u'``: Do not lock database.
-      * ``'m'``: Do not use :manpage:`mmap(2)`.
-        This may harm performance, but improve crash tolerance.
-        .. versionadded:: next
 
       Not all flags are valid for all versions of GDBM.
       See the :data:`open_flags` member for a list of supported flag characters.
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
index 424e23ab3542..295dc201ec0a 100644
--- a/Doc/whatsnew/3.15.rst
+++ b/Doc/whatsnew/3.15.rst
@@ -315,10 +315,6 @@ dbm
   which allow to recover unused free space previously occupied by deleted entries.
   (Contributed by Andrea Oliveri in :gh:`134004`.)
 
-* Add the ``'m'`` flag for :func:`dbm.gnu.open` which allows to disable
-  the use of :manpage:`mmap(2)`.
-  This may harm performance, but improve crash tolerance.
-  (Contributed by Serhiy Storchaka in :gh:`66234`.)
 
 
 difflib
diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py
index e0b988b7b95b..66268c42a300 100644
--- a/Lib/test/test_dbm_gnu.py
+++ b/Lib/test/test_dbm_gnu.py
@@ -74,12 +74,12 @@ class TestGdbm(unittest.TestCase):
         # Test the flag parameter open() by trying all supported flag modes.
         all = set(gdbm.open_flags)
         # Test standard flags (presumably "crwn").
-        modes = all - set('fsum')
+        modes = all - set('fsu')
         for mode in sorted(modes):  # put "c" mode first
             self.g = gdbm.open(filename, mode)
             self.g.close()
 
-        # Test additional flags (presumably "fsum").
+        # Test additional flags (presumably "fsu").
         flags = all - set('crwn')
         for mode in modes:
             for flag in flags:
@@ -217,29 +217,6 @@ class TestGdbm(unittest.TestCase):
             create_empty_file(os.path.join(d, 'test'))
             self.assertRaises(gdbm.error, gdbm.open, filename, 'r')
 
-    @unittest.skipUnless('m' in gdbm.open_flags, "requires 'm' in open_flags")
-    def test_nommap_no_crash(self):
-        self.g = g = gdbm.open(filename, 'nm')
-        os.truncate(filename, 0)
-
-        g.get(b'a', b'c')
-        g.keys()
-        g.firstkey()
-        g.nextkey(b'a')
-        with self.assertRaises(KeyError):
-            g[b'a']
-        with self.assertRaises(gdbm.error):
-            len(g)
-
-        with self.assertRaises(gdbm.error):
-            g[b'a'] = b'c'
-        with self.assertRaises(gdbm.error):
-            del g[b'a']
-        with self.assertRaises(gdbm.error):
-            g.setdefault(b'a', b'c')
-        with self.assertRaises(gdbm.error):
-            g.reorganize()
-
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2025-06-01-15-13-07.gh-issue-66234.Jw7OdC.rst b/Misc/NEWS.d/next/Library/2025-06-01-15-13-07.gh-issue-66234.Jw7OdC.rst
deleted file mode 100644
index 1defb9a72e04..000000000000
--- a/Misc/NEWS.d/next/Library/2025-06-01-15-13-07.gh-issue-66234.Jw7OdC.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Add the ``'m'`` flag for :func:`dbm.gnu.open` which allows to disable the
-use of :manpage:`mmap(2)`. This may harm performance, but improve crash
-tolerance.
diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c
index 7bef6ae7f0c4..a4bc0a0f6755 100644
--- a/Modules/_gdbmmodule.c
+++ b/Modules/_gdbmmodule.c
@@ -807,11 +807,6 @@ dbmopen_impl(PyObject *module, PyObject *filename, const char *flags,
             case 'u':
                 iflags |= GDBM_NOLOCK;
                 break;
-#endif
-#ifdef GDBM_NOMMAP
-            case 'm':
-                iflags |= GDBM_NOMMAP;
-                break;
 #endif
             default:
                 PyErr_Format(state->gdbm_error,
@@ -845,9 +840,6 @@ static const char gdbmmodule_open_flags[] = "rwcn"
 #endif
 #ifdef GDBM_NOLOCK
                                      "u"
-#endif
-#ifdef GDBM_NOMMAP
-                                     "m"
 #endif
                                      ;