--- a/eric6/QScintilla/Shell.py	Sun Jul 05 11:11:24 2020 +0200
+++ b/eric6/QScintilla/Shell.py	Sun Oct 18 12:35:30 2020 +0200
@@ -7,14 +7,10 @@
 Module implementing a graphical Python shell.
 """
 
-
 import sys
 import re
 
-try:
-    from enum import Enum
-except ImportError:
-    from ThirdParty.enum import Enum
+from enum import Enum
 
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, QFileInfo, Qt, QEvent
 from PyQt5.QtGui import QClipboard, QPalette, QFont
@@ -789,7 +785,7 @@
         """
         from .ShellHistoryDialog import ShellHistoryDialog
         dlg = ShellHistoryDialog(self.__history, self.vm, self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.__historyLists[self.clientType], idx = dlg.getHistory()
             self.__history = self.__historyLists[self.clientType]
             self.__setHistoryIndex(index=idx)