Mercurial Repositories > eric / file diff

--- a/eric6/UI/UserInterface.py	Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/UI/UserInterface.py	Sat Aug 31 12:58:11 2019 +0200
@@ -8,10 +8,6 @@
 """
 
 from __future__ import unicode_literals
-try:
-    str = unicode       # __IGNORE_EXCEPTION__
-except NameError:
-    pass
 
 import os
 import sys
@@ -1982,7 +1978,6 @@
             self.actions.append(self.condaWidgetActivateAct)
             self.addAction(self.condaWidgetActivateAct)
         
-        # TODO: add action for "MicroPython", Ctrl+Alt+Shift+M
         if self.microPythonWidget is not None:
             self.microPythonWidgetActivateAct = E5Action(
                 self.tr('MicroPython'),
@@ -2783,25 +2778,21 @@
         except ImportError:
             self.pyqt4DocAct = None
         
-        try:
-            import PyQt5        # __IGNORE_WARNING__
-            self.pyqt5DocAct = E5Action(
-                self.tr('PyQt5 Documentation'),
-                self.tr('PyQt&5 Documentation'),
-                0, 0, self, 'pyqt5_documentation')
-            self.pyqt5DocAct.setStatusTip(self.tr(
-                'Open PyQt5 Documentation'))
-            self.pyqt5DocAct.setWhatsThis(self.tr(
-                """<b>PyQt5 Documentation</b>"""
-                """<p>Display the PyQt5 Documentation. Dependent upon your"""
-                """ settings, this will either show the help in Eric's"""
-                """ internal help viewer/web browser, or execute a web"""
-                """ browser or Qt Assistant. </p>"""
-            ))
-            self.pyqt5DocAct.triggered.connect(self.__showPyQt5Doc)
-            self.actions.append(self.pyqt5DocAct)
-        except ImportError:
-            self.pyqt5DocAct = None
+        self.pyqt5DocAct = E5Action(
+            self.tr('PyQt5 Documentation'),
+            self.tr('PyQt&5 Documentation'),
+            0, 0, self, 'pyqt5_documentation')
+        self.pyqt5DocAct.setStatusTip(self.tr(
+            'Open PyQt5 Documentation'))
+        self.pyqt5DocAct.setWhatsThis(self.tr(
+            """<b>PyQt5 Documentation</b>"""
+            """<p>Display the PyQt5 Documentation. Dependent upon your"""
+            """ settings, this will either show the help in Eric's"""
+            """ internal help viewer/web browser, or execute a web"""
+            """ browser or Qt Assistant. </p>"""
+        ))
+        self.pyqt5DocAct.triggered.connect(self.__showPyQt5Doc)
+        self.actions.append(self.pyqt5DocAct)
         
     def __initPythonDocActions(self):
         """