From 85356b9d81cf6fe36f9f0667234f906afb676678 2018-09-07 10:53:52
From: Christoph <cbj@mail.uni-paderborn.de>
Date: 2018-09-07 10:53:52
Subject: [PATCH] apply comments

---

diff --git a/IPython/terminal/pt_inputhooks/qt.py b/IPython/terminal/pt_inputhooks/qt.py
index d2e23ab..7395ac3 100644
--- a/IPython/terminal/pt_inputhooks/qt.py
+++ b/IPython/terminal/pt_inputhooks/qt.py
@@ -12,18 +12,16 @@ def inputhook(context):
     app = QtCore.QCoreApplication.instance()
     if not app:
         if sys.platform == 'linux':
-            try:
-                # DISPLAY or WAYLAND_DISPLAY is set and not empty
-                assert os.environ.get('DISPLAY') or os.environ.get('WAYLAND_DISPLAY')
-            except Exception:
+            if not os.environ.get('DISPLAY') \
+                    and not os.environ.get('WAYLAND_DISPLAY'):
                 import warnings
                 global _already_warned
                 if not _already_warned:
                     _already_warned = True
                     warnings.warn(
-                        'The DISPLAY enviroment variable is not set or empty '
-                        'and Qt5 requires this enviroment variable. '
-                        'Deactivate Qt5 code.'
+                        'The DISPLAY or WAYLAND_DISPLAY enviroment variable is '
+                        'not set or empty and Qt5 requires this enviroment '
+                        'variable. Deactivate Qt5 code.'
                     )
                 return
         _appref = app = QtGui.QApplication([" "])