Revert "bpo-42160: tempfile: Reduce overhead of pid check. (GH-22997)"

`_RandomNameSequence` is not true singleton so using `os.register_at_fork` doesn't make sense unlike `random._inst`.

This reverts commit 8e409cebad42032bb7d0f2cadd8b1e36081d98af.

diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index 1bc5c71fd03494477130e33e285a645e9d479e34..770f72c25295cbe756ef32b618682090e6b09b1b 100644 (file)
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -129,22 +129,24 @@ class _RandomNameSequence:
 
     _RandomNameSequence is an iterator."""
 
-    def __init__(self, characters="abcdefghijklmnopqrstuvwxyz0123456789_", length=8, rng=None):
-        if rng is None:
-            rng = _Random()
-        if hasattr(_os, "fork"):
-            # prevent same state after fork
-            _os.register_at_fork(after_in_child=rng.seed)
-        self.rng = rng
-        self.characters = characters
-        self.length = length
+    characters = "abcdefghijklmnopqrstuvwxyz0123456789_"
+
+    @property
+    def rng(self):
+        cur_pid = _os.getpid()
+        if cur_pid != getattr(self, '_rng_pid', None):
+            self._rng = _Random()
+            self._rng_pid = cur_pid
+        return self._rng
 
     def __iter__(self):
         return self
 
     def __next__(self):
         c = self.characters
-        return ''.join(self.rng.choices(c, k=self.length))
+        choose = self.rng.choice
+        letters = [choose(c) for dummy in range(8)]
+        return ''.join(letters)
 
 def _candidate_tempdir_list():
     """Generate a list of candidate temporary directories which

diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 77d710efaf107b9c91163dccd30ea7aebd07a854..8ace883d74bb24def59421a09671b1444e6b0756 100644 (file)
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -153,8 +153,8 @@ class TestRandomNameSequence(BaseTestCase):
         self.r = tempfile._RandomNameSequence()
         super().setUp()
 
-    def test_get_eight_char_str(self):
-        # _RandomNameSequence returns a eight-character string
+    def test_get_six_char_str(self):
+        # _RandomNameSequence returns a six-character string
         s = next(self.r)
         self.nameCheck(s, '', '', '')
 

diff --git a/Misc/NEWS.d/next/Library/2020-10-27-00-42-09.bpo-42160.eiLOCi.rst b/Misc/NEWS.d/next/Library/2020-10-27-00-42-09.bpo-42160.eiLOCi.rst
deleted file mode 100644 (file)
index c5f3091..0000000
--- a/Misc/NEWS.d/next/Library/2020-10-27-00-42-09.bpo-42160.eiLOCi.rst
+++ /dev/null
@@ -1 +0,0 @@
-Replaced pid check in ``tempfile._RandomNameSequence`` with ``os.register_at_fork`` to reduce overhead.