eric: comparison eric7/WebBrowser/WebBrowserView.py

-:936662560d04
+:b108ff4d845c
 (QContextMenuEvent)
 """
 pos = evt.pos()
 reason = evt.reason()
 QTimer.singleShot(
-0,
+0, functools.partial(
-lambda: self._contextMenuEvent(QContextMenuEvent(reason, pos)))
+self._contextMenuEvent, QContextMenuEvent(reason, pos)))
 # needs to be done this way because contextMenuEvent is blocking
 # the main loop
 def _contextMenuEvent(self, evt):
 """
 if not self.__menu.isEmpty():
 pos = evt.globalPos()
 self.__menu.popup(QPoint(pos.x(), pos.y() + 1))
-# TODO: change all lambda functions to partials to fix an issue
 def __createContextMenu(self, menu, hitTest):
 """
 Private method to populate the context menu.
 @param menu reference to the menu to be populated
 act = menu.addAction(
 UI.PixmapCache.getIcon("openNewTab"),
 self.tr("Open Link in New Tab\tCtrl+LMB"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__openLinkInNewTab(act))
+functools.partial(self.__openLinkInNewTab, act))
 act = menu.addAction(
 UI.PixmapCache.getIcon("newWindow"),
 self.tr("Open Link in New Window"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__openLinkInNewWindow(act))
+functools.partial(self.__openLinkInNewWindow, act))
 act = menu.addAction(
 UI.PixmapCache.getIcon("privateMode"),
 self.tr("Open Link in New Private Window"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__openLinkInNewPrivateWindow(act))
+functools.partial(self.__openLinkInNewPrivateWindow, act))
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("download"),
 self.tr("Save Lin&k"), self.__downloadLink)
 act = menu.addAction(
 UI.PixmapCache.getIcon("bookmark22"),
 self.tr("Bookmark this Link"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__bookmarkLink(act))
+functools.partial(self.__bookmarkLink, act))
 menu.addSeparator()
 act = menu.addAction(
 UI.PixmapCache.getIcon("editCopy"),
 self.tr("Copy Link to Clipboard"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__copyLink(act))
+functools.partial(self.__copyLink, act))
 act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend"),
 self.tr("Send Link"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__sendLink(act))
+functools.partial(self.__sendLink, act))
 if (
 Preferences.getWebBrowser("VirusTotalEnabled") and
 Preferences.getWebBrowser("VirusTotalServiceKey") != ""
 ):
 act = menu.addAction(
 UI.PixmapCache.getIcon("virustotal"),
 self.tr("Scan Link with VirusTotal"))
 act.setData(hitTest.linkUrl())
 act.triggered.connect(
-lambda: self.__virusTotal(act))
+functools.partial(self.__virusTotal, act))
 def __createImageContextMenu(self, menu, hitTest):
 """
 Private method to populate the context menu for images.
 act = menu.addAction(
 UI.PixmapCache.getIcon("openNewTab"),
 self.tr("Open Image in New Tab"))
 act.setData(hitTest.imageUrl())
 act.triggered.connect(
-lambda: self.__openLinkInNewTab(act))
+functools.partial(self.__openLinkInNewTab, act))
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("download"),
 self.tr("Save Image"), self.__downloadImage)
 menu.addAction(
 act = menu.addAction(
 UI.PixmapCache.getIcon("editCopy"),
 self.tr("Copy Image Location to Clipboard"))
 act.setData(hitTest.imageUrl())
 act.triggered.connect(
-lambda: self.__copyLink(act))
+functools.partial(self.__copyLink, act))
 act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend"),
 self.tr("Send Image Link"))
 act.setData(hitTest.imageUrl())
 act.triggered.connect(
-lambda: self.__sendLink(act))
+functools.partial(self.__sendLink, act))
 if hitTest.imageUrl().scheme() in ["http", "https"]:
 menu.addSeparator()
 engine = WebBrowserWindow.imageSearchEngine()
 searchEngineName = engine.searchEngine()
 UI.PixmapCache.getIcon("{0}".format(
 searchEngineName.lower())),
 self.tr("Search image in {0}").format(searchEngineName))
 act.setData(engine.getSearchQuery(hitTest.imageUrl()))
 act.triggered.connect(
-lambda: self.__searchImage(act))
+functools.partial(self.__searchImage, act))
 self.__imageSearchMenu = menu.addMenu(
 self.tr("Search image with..."))
 for searchEngineName in engine.searchEngineNames():
 act = self.__imageSearchMenu.addAction(
 UI.PixmapCache.getIcon("{0}".format(
 act = menu.addAction(
 UI.PixmapCache.getIcon("adBlockPlus"),
 self.tr("Block Image"))
 act.setData(hitTest.imageUrl().toString())
 act.triggered.connect(
-lambda: self.__blockImage(act))
+functools.partial(self.__blockImage, act))
 if (
 Preferences.getWebBrowser("VirusTotalEnabled") and
 Preferences.getWebBrowser("VirusTotalServiceKey") != ""
 ):
 act = menu.addAction(
 UI.PixmapCache.getIcon("virustotal"),
 self.tr("Scan Image with VirusTotal"))
 act.setData(hitTest.imageUrl())
 act.triggered.connect(
-lambda: self.__virusTotal(act))
+functools.partial(self.__virusTotal, act))
 def __createMediaContextMenu(self, menu, hitTest):
 """
 Private method to populate the context menu for media elements.
 act = menu.addAction(
 UI.PixmapCache.getIcon("editCopy"),
 self.tr("Copy Media Address to Clipboard"))
 act.setData(hitTest.mediaUrl())
 act.triggered.connect(
-lambda: self.__copyLink(act))
+functools.partial(self.__copyLink, act))
 act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend"),
 self.tr("Send Media Address"))
 act.setData(hitTest.mediaUrl())
 act.triggered.connect(
-lambda: self.__sendLink(act))
+functools.partial(self.__sendLink, act))
 menu.addAction(
 UI.PixmapCache.getIcon("download"),
 self.tr("Save Media"), self.__downloadMedia)
 def __createSelectedTextContextMenu(self, menu, hitTest):
 act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend"),
 self.tr("Send Text"))
 act.setData(self.selectedText())
 act.triggered.connect(
-lambda: self.__sendLink(act))
+functools.partial(self.__sendLink, act))
 engineName = self.__mw.openSearchManager().currentEngineName()
 if engineName:
 menu.addAction(self.tr("Search with '{0}'").format(engineName),
 self.__searchDefaultRequested)
 language = languages[0]
 langCode = language.split("[")[1][:2]
 googleTranslatorUrl = QUrl(
 "http://translate.google.com/#auto/{0}/{1}".format(
 langCode, self.selectedText()))
-act1 = menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("translate"),
 self.tr("Google Translate"))
-act1.setData(googleTranslatorUrl)
+act.setData(googleTranslatorUrl)
-act1.triggered.connect(
+act.triggered.connect(
-lambda: self.__openLinkInNewTab(act1))
+functools.partial(self.__openLinkInNewTab, act))
 wiktionaryUrl = QUrl(
 "http://{0}.wiktionary.org/wiki/Special:Search?search={1}"
 .format(langCode, self.selectedText()))
-act2 = menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("wikipedia"),
 self.tr("Dictionary"))
-act2.setData(wiktionaryUrl)
+act.setData(wiktionaryUrl)
-act2.triggered.connect(
+act.triggered.connect(
-lambda: self.__openLinkInNewTab(act2))
+functools.partial(self.__openLinkInNewTab, act))
 menu.addSeparator()
 guessedUrl = QUrl.fromUserInput(self.selectedText().strip())
 if self.__isUrlValid(guessedUrl):
-act3 = menu.addAction(self.tr("Go to web address"))
+act = menu.addAction(self.tr("Go to web address"))
-act3.setData(guessedUrl)
+act.setData(guessedUrl)
-act3.triggered.connect(
+act.triggered.connect(
-lambda: self.__openLinkInNewTab(act3))
+functools.partial(self.__openLinkInNewTab, act))
 def __createPageContextMenu(self, menu):
 """
 Private method to populate the basic context menu.
 act = menu.addAction(
 UI.PixmapCache.getIcon("editCopy"),
 self.tr("Copy Page Link"))
 act.setData(self.url())
 act.triggered.connect(
-lambda: self.__copyLink(act))
+functools.partial(self.__copyLink, act))
 act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend"),
 self.tr("Send Page Link"))
 act.setData(self.url())
 act.triggered.connect(
-lambda: self.__sendLink(act))
+functools.partial(self.__sendLink, act))
 menu.addSeparator()
 from .UserAgent.UserAgentMenu import UserAgentMenu
 self.__userAgentMenu = UserAgentMenu(self.tr("User Agent"),
 url=self.url())
 menu.addSeparator()
 w3url = QUrl.fromEncoded(
 b"http://validator.w3.org/check?uri=" +
 QUrl.toPercentEncoding(bytes(self.url().toEncoded()).decode()))
-act1 = menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("w3"),
 self.tr("Validate Page"))
-act1.setData(w3url)
+act.setData(w3url)
-act1.triggered.connect(
+act.triggered.connect(
-lambda: self.__openLinkInNewTab(act1))
+functools.partial(self.__openLinkInNewTab, act))
 from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
 languages = Preferences.toList(
 Preferences.getSettings().value(
 "WebBrowser/AcceptLanguages",
 b"http://translate.google.com/translate?sl=auto&tl=" +
 langCode.encode() +
 b"&u=" +
 QUrl.toPercentEncoding(
 bytes(self.url().toEncoded()).decode()))
-act2 = menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("translate"),
 self.tr("Google Translate"))
-act2.setData(googleTranslatorUrl)
+act.setData(googleTranslatorUrl)
-act2.triggered.connect(
+act.triggered.connect(
-lambda: self.__openLinkInNewTab(act2))
+functools.partial(self.__openLinkInNewTab, act))
 def __checkForForm(self, act, pos):
 """
 Private method to check the given position for an open search form.
 QWebEnginePage.RenderProcessTerminationStatus
 .NormalTerminationStatus
 ):
 return
-QTimer.singleShot(0, lambda: self.__showTabCrashPage(status))
+QTimer.singleShot(0,
+functools.partial(self.__showTabCrashPage, status))
 def __showTabCrashPage(self, status):
 """
 Private slot to show the tab crash page.

Mercurial Repositories > eric / file comparison

comparison: eric7/WebBrowser/WebBrowserView.py

eric7/WebBrowser/WebBrowserView.py