Mercurial Repositories > eric / file diff

--- a/Helpviewer/UserAgent/UserAgentMenu.py	Fri Oct 18 23:00:41 2013 +0200
+++ b/Helpviewer/UserAgent/UserAgentMenu.py	Fri Nov 01 15:48:48 2013 +0100
@@ -9,7 +9,7 @@
 
 from __future__ import unicode_literals    # __IGNORE_WARNING__
 
-from PyQt4.QtCore import QByteArray, QXmlStreamReader
+from PyQt4.QtCore import QXmlStreamReader, QFile, QIODevice
 from PyQt4.QtGui import QMenu, QAction, QActionGroup, QInputDialog, QLineEdit
 
 from E5Gui import E5MessageBox
@@ -123,10 +123,12 @@
         
         @return flag indicating that a user agent entry is checked (boolean)
         """
-        from .UserAgentDefaults import UserAgentDefaults
+        from . import UserAgentDefaults_rc              # __IGNORE_WARNING__
+        defaultUserAgents = QFile(":/UserAgentDefaults.xml")
+        defaultUserAgents.open(QIODevice.ReadOnly)
+        
         menuStack = []
         isChecked = False
-        defaultUserAgents = QByteArray(UserAgentDefaults)
         
         if self.__url:
             currentUserAgentString = self.__manager.userAgentForUrl(self.__url)
@@ -177,7 +179,8 @@
                 menuStack.pop()
         
         if xml.hasError():
-            E5MessageBox.critical(self,
+            E5MessageBox.critical(
+                self,
                 self.trUtf8("Parsing default user agents"),
                 self.trUtf8(
                     """<p>Error parsing default user agents.</p><p>{0}</p>""")