Make unbuildReactor private

twisted · Oct 12, 2023 · d6f72ae · d6f72ae
1 parent 255823c
commit d6f72ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/twisted/internet/test/reactormixins.py b/src/twisted/internet/test/reactormixins.py
@@ -216,7 +216,7 @@ def tearDown(self):
                         % (process.reapProcessHandlers,)
                     )
 
-    def unbuildReactor(self, reactor, globalReactorWasMunged=True):
+    def _unbuildReactor(self, reactor):
         """
         Clean up any resources which may have been allocated for the given
         reactor by its creation or by a test which used it.
@@ -247,12 +247,11 @@ def unbuildReactor(self, reactor, globalReactorWasMunged=True):
         for c in calls:
             c.cancel()
 
-        if globalReactorWasMunged:
-            # Restore the original reactor state:
-            from twisted.internet import reactor as globalReactor
+        # Restore the original reactor state:
+        from twisted.internet import reactor as globalReactor
 
-            globalReactor.__dict__ = reactor._originalReactorDict
-            globalReactor.__class__ = reactor._originalReactorClass
+        globalReactor.__dict__ = reactor._originalReactorDict
+        globalReactor.__class__ = reactor._originalReactorClass
 
     def buildReactor(self):
         """
@@ -299,15 +298,15 @@ def buildReactor(self):
                     if not required.providedBy(reactor)
                 ]
                 if missing:
-                    self.unbuildReactor(reactor)
+                    self._unbuildReactor(reactor)
                     raise SkipTest(
                         "%s does not provide %s"
                         % (
                             fullyQualifiedName(reactor.__class__),
                             ",".join([fullyQualifiedName(x) for x in missing]),
                         )
                     )
-        self.addCleanup(self.unbuildReactor, reactor)
+        self.addCleanup(self._unbuildReactor, reactor)
         return reactor
 
     def getTimeout(self):

diff --git a/src/twisted/internet/test/test_stdio.py b/src/twisted/internet/test/test_stdio.py
@@ -99,8 +99,7 @@ def test_removeReader(self):
         no longer polled.
         """
         reactor = self.buildReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
-
+
         path = self.mktemp()
         open(path, "wb").close()
 
@@ -122,8 +121,7 @@ def test_removeWriter(self):
         no longer polled.
         """
         reactor = self.buildReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
-
+
         # Cleanup might fail if file is GCed too soon:
         self.f = f = open(self.mktemp(), "wb")
 
@@ -143,8 +141,7 @@ def test_removeAll(self):
         filesystem files.
         """
         reactor = self.buildReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
-
+
         path = self.mktemp()
         open(path, "wb").close()
 
@@ -168,8 +165,7 @@ def test_getReaders(self):
         C{reactor.getReaders} includes descriptors that are filesystem files.
         """
         reactor = self.buildReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
-
+
         path = self.mktemp()
         open(path, "wb").close()
 
@@ -189,8 +185,7 @@ def test_getWriters(self):
         C{reactor.getWriters} includes descriptors that are filesystem files.
         """
         reactor = self.buildReactor()
-        self.addCleanup(self.unbuildReactor, reactor)
-
+
         # Cleanup might fail if file is GCed too soon:
         self.f = f = open(self.mktemp(), "wb")