gtk3: remove check for DISPLAY variable

src/twisted/internet/gtk3reactor.py

@@ -19,23 +19,9 @@
 Then use twisted.internet APIs as usual.
 """
 
-
-import os
-
 from twisted.internet import gireactor
 from twisted.python import runtime
 
-# Newer versions of gtk3/pygoject raise a RuntimeError, or just break in a
-# confusing manner, if the program is not running under X11.  We therefore try
-# to fail in a more reasonable manner, and check for $DISPLAY as a reasonable
-# approximation of availability of X11. This is somewhat over-aggressive,
-# since some older versions of gtk3/pygobject do work with missing $DISPLAY,
-# but it's too hard to figure out which, so we always require it.
-if (runtime.platform.getType() == 'posix' and
-    not runtime.platform.isMacOSX() and not os.environ.get("DISPLAY")):
-    raise ImportError(
-        "Gtk3 requires X11, and no DISPLAY environment variable is set")
-
 
 class Gtk3Reactor(gireactor.GIReactor):
     """

src/twisted/internet/test/test_gireactor.py

@@ -6,7 +6,6 @@
 """
 
 
-import os
 import sys
 from unittest import skipIf
 try:
@@ -27,11 +26,9 @@
         gtk3reactor = _gtk3reactor
         from gi.repository import Gtk
 
-from twisted.python.runtime import platform
 from twisted.internet.error import ReactorAlreadyRunning
 from twisted.trial.unittest import TestCase, SkipTest
 from twisted.internet.test.reactormixins import ReactorBuilder
-from twisted.test.test_twisted import SetAsideModule
 
 # Skip all tests if gi is unavailable:
 if gireactor is None:
@@ -187,29 +184,3 @@ def test_compatibilityLayer(self):
             raise SkipTest("This version of gi doesn't include pygtkcompat.")
         import gobject
         self.assertTrue(gobject.__name__.startswith("gi."))
-
-
-
-class Gtk3ReactorTests(TestCase):
-    """
-    Tests for L{gtk3reactor}.
-    """
-
-    @skipIf(platform.getType() != "posix" or platform.isMacOSX(),
-            "This test is only relevant when using X11")
-    def test_requiresDISPLAY(self):
-        """
-        On X11, L{gtk3reactor} is unimportable if the C{DISPLAY} environment
-        variable is not set.
-        """
-        display = os.environ.get("DISPLAY", None)
-        if display is not None:
-            self.addCleanup(os.environ.__setitem__, "DISPLAY", display)
-            del os.environ["DISPLAY"]
-        with SetAsideModule("twisted.internet.gtk3reactor"):
-            exc = self.assertRaises(ImportError,
-                                    __import__, "twisted.internet.gtk3reactor")
-            self.assertEqual(
-                exc.args[0],
-                "Gtk3 requires X11, and no DISPLAY environment "
-                "variable is set")

src/twisted/newsfragments/9904.bugfix

@@ -0,0 +1 @@
+The Gtk3 reactor now runs on Wayland-only sessions