--- a/src/eric7/WebBrowser/SpeedDial/SpeedDialReader.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/WebBrowser/SpeedDial/SpeedDialReader.py Wed Jul 13 14:55:47 2022 +0200 @@ -15,16 +15,17 @@ """ Class implementing a reader object for speed dial data files. """ + def __init__(self): """ Constructor """ super().__init__() - + def read(self, fileNameOrDevice): """ Public method to read a user agent file. - + @param fileNameOrDevice name of the file to read (string) or reference to the device to read (QIODevice) @return list of speed dial pages (list of Page), number of pages per @@ -33,7 +34,7 @@ self.__pages = [] self.__pagesPerRow = 0 self.__sdSize = 0 - + if isinstance(fileNameOrDevice, QIODevice): self.setDevice(fileNameOrDevice) else: @@ -42,36 +43,38 @@ return self.__pages, self.__pagesPerRow, self.__sdSize opened = f.open(QIODevice.OpenModeFlag.ReadOnly) if not opened: - self.raiseError(QCoreApplication.translate( - "SpeedDialReader", - "The file {0} could not be opened. Error: {1}").format( - fileNameOrDevice, f.errorString())) + self.raiseError( + QCoreApplication.translate( + "SpeedDialReader", + "The file {0} could not be opened. Error: {1}", + ).format(fileNameOrDevice, f.errorString()) + ) return self.__pages, self.__pagesPerRow, self.__sdSize self.setDevice(f) - + while not self.atEnd(): self.readNext() if self.isStartElement(): version = self.attributes().value("version") - if ( - self.name() == "SpeedDial" and - (not version or version == "1.0") - ): + if self.name() == "SpeedDial" and (not version or version == "1.0"): self.__readSpeedDial() else: - self.raiseError(QCoreApplication.translate( - "SpeedDialReader", - "The file is not a SpeedDial version 1.0 file.")) - + self.raiseError( + QCoreApplication.translate( + "SpeedDialReader", + "The file is not a SpeedDial version 1.0 file.", + ) + ) + return self.__pages, self.__pagesPerRow, self.__sdSize - + def __readSpeedDial(self): """ Private method to read the speed dial data. """ if not self.isStartElement() and self.name() != "SpeedDial": return - + while not self.atEnd(): self.readNext() if self.isEndElement(): @@ -79,7 +82,7 @@ continue else: break - + if self.isStartElement(): if self.name() == "Pages": attributes = self.attributes() @@ -97,22 +100,23 @@ if not title: title = url from .Page import Page + page = Page(url, title) self.__pages.append(page) else: self.__skipUnknownElement() - + def __skipUnknownElement(self): """ Private method to skip over all unknown elements. """ if not self.isStartElement(): return - + while not self.atEnd(): self.readNext() if self.isEndElement(): break - + if self.isStartElement(): self.__skipUnknownElement()