--- a/eric6/UI/BrowserModel.py Wed Apr 21 19:40:50 2021 +0200 +++ b/eric6/UI/BrowserModel.py Thu Apr 22 18:02:47 2021 +0200 @@ -172,10 +172,11 @@ ): return QModelIndex() - if not parent.isValid(): - parentItem = self.rootItem - else: - parentItem = parent.internalPointer() + parentItem = ( + parent.internalPointer() + if parent.isValid() else + self.rootItem + ) try: if not parentItem.isPopulated(): @@ -346,15 +347,16 @@ cnt = itm.childCount() self.beginInsertRows( self.createIndex(itm.row(), 0, itm), cnt, cnt) - if f.isDir(): - node = BrowserDirectoryItem( + node = ( + BrowserDirectoryItem( itm, Utilities.toNativeSeparators(f.absoluteFilePath()), False) - else: - node = BrowserFileItem( + if f.isDir() else + BrowserFileItem( itm, Utilities.toNativeSeparators(f.absoluteFilePath())) + ) self._addItem(node, itm) self.endInsertRows() @@ -510,10 +512,11 @@ if parent is None: parent = QModelIndex() - if not parent.isValid(): - parentItem = self.rootItem - else: - parentItem = parent.internalPointer() + parentItem = ( + parent.internalPointer() + if parent.isValid() else + self.rootItem + ) cnt = parentItem.childCount() self.beginInsertRows(parent, cnt, cnt) @@ -604,10 +607,11 @@ self.createIndex(parentItem.row(), 0, parentItem), 0, len(syspath) - 1) for p in syspath: - if os.path.isdir(p): - node = BrowserDirectoryItem(parentItem, p) - else: - node = BrowserFileItem(parentItem, p) + node = ( + BrowserDirectoryItem(parentItem, p) + if os.path.isdir(p) else + BrowserFileItem(parentItem, p) + ) self._addItem(node, parentItem) if repopulate: self.endInsertRows()