Mercurial Repositories > eric / changeset
changeset
Fixed a few issues introduced by the pathlib change.
Mon, 27 Jun 2022 18:05:36 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 27 Jun 2022 18:05:36 +0200
- branch
- eric7
- changeset 9186
- 0c28a1670e06
- parent 9185
- 8975ed45c22d
- child 9187
- e53e07c6f482
Fixed a few issues introduced by the pathlib change.
--- a/eric7/PluginManager/PluginManager.py Mon Jun 27 17:13:05 2022 +0200 +++ b/eric7/PluginManager/PluginManager.py Mon Jun 27 18:05:36 2022 +0200 @@ -1246,7 +1246,7 @@ ): return - elif period in [1, 2, 3]: + elif period in [1, 2, 3] and pathlib.Path(self.pluginRepositoryFile).exists(): lastModified = datetime.datetime.fromtimestamp( pathlib.Path(self.pluginRepositoryFile).stat().st_mtime )
--- a/eric7/QScintilla/APIsManager.py Mon Jun 27 17:13:05 2022 +0200 +++ b/eric7/QScintilla/APIsManager.py Mon Jun 27 18:05:36 2022 +0200 @@ -176,8 +176,10 @@ if self.__apifiles != apifiles: needsPreparation = True for apifile in apifiles: + apifilePath = pathlib.Path(apifile) if ( - pathlib.Path(apifile).stat().st_mtime > + apifilePath.exists() and + apifilePath.stat().st_mtime > preparedAPIsModified ): needsPreparation = True
--- a/eric7/QScintilla/Editor.py Mon Jun 27 17:13:05 2022 +0200 +++ b/eric7/QScintilla/Editor.py Mon Jun 27 18:05:36 2022 +0200 @@ -3233,7 +3233,7 @@ self.extractTasks() self.setModified(modified) - self.lastModified = pathlib.Path(self.fileName).stat().st_mtime + self.lastModified = pathlib.Path(fn).stat().st_mtime def __convertTabs(self): """ @@ -3484,7 +3484,7 @@ self.setLanguage(self.fileName) - self.lastModified = pathlib.Path(self.fileName).stat().st_mtime + self.lastModified = pathlib.Path(fn).stat().st_mtime if newName is not None: self.vm.addToRecentList(newName) self.editorSaved.emit(self.fileName) @@ -3525,7 +3525,7 @@ if self.lexer_ is None: self.setLanguage(self.fileName) - self.lastModified = pathlib.Path(self.fileName).stat().st_mtime + self.lastModified = pathlib.Path(fn).stat().st_mtime self.vm.setEditorName(self, self.fileName) self.__updateReadOnly(True)
--- a/eric7/WebBrowser/Session/SessionManagerDialog.py Mon Jun 27 17:13:05 2022 +0200 +++ b/eric7/WebBrowser/Session/SessionManagerDialog.py Mon Jun 27 18:05:36 2022 +0200 @@ -60,21 +60,22 @@ sessions = WebBrowserWindow.sessionManager().sessionMetaData( includeBackups=True) for session in sessions: - itm = QTreeWidgetItem() - itm.setText(0, session.name) - itm.setText(1, datetime.datetime.fromtimestamp( - pathlib.Path(session.filePath).stat().st_mtime) - .isoformat(sep=" ", timespec="minutes")) - itm.setData(0, SessionManagerDialog.SessionFileRole, - session.filePath) - itm.setData(0, SessionManagerDialog.BackupSessionRole, - session.isBackup) - itm.setData(0, SessionManagerDialog.ActiveSessionRole, - session.isActive) - itm.setData(0, SessionManagerDialog.DefaultSessionRole, - session.isDefault) - self.__updateSessionItem(itm) - self.sessionsList.addTopLevelItem(itm) + if pathlib.Path(session.filePath).exists(): + itm = QTreeWidgetItem() + itm.setText(0, session.name) + itm.setText(1, datetime.datetime.fromtimestamp( + pathlib.Path(session.filePath).stat().st_mtime) + .isoformat(sep=" ", timespec="minutes")) + itm.setData(0, SessionManagerDialog.SessionFileRole, + session.filePath) + itm.setData(0, SessionManagerDialog.BackupSessionRole, + session.isBackup) + itm.setData(0, SessionManagerDialog.ActiveSessionRole, + session.isActive) + itm.setData(0, SessionManagerDialog.DefaultSessionRole, + session.isDefault) + self.__updateSessionItem(itm) + self.sessionsList.addTopLevelItem(itm) self.__updateButtons()
--- a/eric7/WebBrowser/Sync/FtpSyncHandler.py Mon Jun 27 17:13:05 2022 +0200 +++ b/eric7/WebBrowser/Sync/FtpSyncHandler.py Mon Jun 27 18:05:36 2022 +0200 @@ -261,6 +261,7 @@ self._remoteFiles[type_] in self.__remoteFilesFound ): if ( + not pathlib.Path(fileName).exists() or pathlib.Path(fileName).stat().st_mtime < self.__remoteFilesFound[ self._remoteFiles[type_].toSecsSinceEpoch()]
