diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/WebBrowser/UserAgent/UserAgentMenu.py
--- a/src/eric7/WebBrowser/UserAgent/UserAgentMenu.py Sun Nov 06 11:22:39 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentMenu.py Mon Nov 07 17:19:58 2022 +0100
@@ -15,6 +15,8 @@
from PyQt6.QtWidgets import QInputDialog, QLineEdit, QMenu
from eric7.EricWidgets import EricMessageBox
+from eric7.WebBrowser.WebBrowserPage import WebBrowserPage
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
class UserAgentMenu(QMenu):
@@ -36,8 +38,6 @@
self.__url = url
if self.__url:
if self.__url.isValid():
- from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
self.__manager = WebBrowserWindow.userAgentsManager()
else:
self.__url = None
@@ -62,8 +62,6 @@
self.__manager.userAgentForUrl(self.__url) == ""
)
else:
- from eric7.WebBrowser.WebBrowserPage import WebBrowserPage
-
self.__defaultUserAgent.setChecked(WebBrowserPage.userAgent() == "")
self.addAction(self.__defaultUserAgent)
self.__actionGroup.addAction(self.__defaultUserAgent)
@@ -89,8 +87,6 @@
if self.__url:
self.__manager.removeUserAgent(self.__url.host())
else:
- from eric7.WebBrowser.WebBrowserPage import WebBrowserPage
-
WebBrowserPage.setUserAgent("")
def __switchToOtherUserAgent(self):
@@ -122,8 +118,6 @@
if self.__url:
self.__manager.setUserAgentForUrl(self.__url, act.data())
else:
- from eric7.WebBrowser.WebBrowserPage import WebBrowserPage
-
WebBrowserPage.setUserAgent(act.data())
def __addDefaultActions(self):
@@ -140,12 +134,11 @@
menuStack = []
isChecked = False
- if self.__url:
- currentUserAgentString = self.__manager.userAgentForUrl(self.__url)
- else:
- from eric7.WebBrowser.WebBrowserPage import WebBrowserPage
-
- currentUserAgentString = WebBrowserPage.userAgent()
+ currentUserAgentString = (
+ self.__manager.userAgentForUrl(self.__url)
+ if self.__url
+ else WebBrowserPage.userAgent()
+ )
xml = QXmlStreamReader(defaultUserAgents)
while not xml.atEnd():
xml.readNext()
