Mercurial Repositories > eric / changeset

--- a/E5Gui/E5TextEditSearchWidget.py	Sun Oct 22 14:53:34 2017 +0200
+++ b/E5Gui/E5TextEditSearchWidget.py	Sun Oct 22 15:42:00 2017 +0200
@@ -202,13 +202,14 @@
         """
         from PyQt5.QtWebKitWidgets import QWebPage
         
-        findFlags = QWebPage.FindFlags(QWebPage.HighlightAllOccurrences)
+        findFlags = QWebPage.FindFlags(QWebPage.FindWrapsAroundDocument)
         if self.caseCheckBox.isChecked():
             findFlags |= QWebPage.FindCaseSensitively
         if backwards:
             findFlags |= QWebPage.FindBackward
         
-        return self.findText(self.findtextCombo.currentText(), findFlags)
+        return self.__textedit.findText(self.findtextCombo.currentText(),
+                                        findFlags)
     
     def __findPrevNextQWebEngineView(self, backwards):
         """

--- a/UI/CodeDocumentationViewer.py	Sun Oct 22 14:53:34 2017 +0200
+++ b/UI/CodeDocumentationViewer.py	Sun Oct 22 15:42:00 2017 +0200
@@ -9,6 +9,10 @@
 """
 
 from __future__ import unicode_literals
+try:
+    basestring    # __IGNORE_WARNING__
+except NameError:
+    basestring = str
 
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl
 from PyQt5.QtGui import QCursor
@@ -456,7 +460,7 @@
                     html = documentationInfo
                 self.__setHtml(html)
             else:
-                if isinstance(documentationInfo, str):
+                if isinstance(documentationInfo, basestring):
                     fullText = documentationInfo
                 elif isinstance(documentationInfo, dict):
                     name = documentationInfo["name"]