eric: comparison eric6/UI/BrowserModel.py

-:fb0ef164f536
+:698ae46f40a4
 """
 import os
 import fnmatch
 import json
+import contextlib
 from PyQt5.QtCore import (
 QDir, QModelIndex, QAbstractItemModel, QFileSystemWatcher, Qt, QProcess,
 QCoreApplication
 )
 @param parent reference to parent object (QObject)
 @param nopopulate flag indicating to not populate the model
 (boolean)
 """
-super(BrowserModel, self).__init__(parent)
+super().__init__(parent)
 self.progDir = None
 self.__sysPathInterpreter = ""
 self.__sysPathItem = None
 @return number of columns (integer)
 """
 if parent is None:
 parent = QModelIndex()
-if parent.isValid():
+item = (parent.internalPointer() if parent.isValid()
-item = parent.internalPointer()
+else self.rootItem)
-else:
-item = self.rootItem
 return item.columnCount() + 1
 def data(self, index, role):
 """
 row >= self.rowCount(parent) or
 column >= self.columnCount(parent)
 ):
 return QModelIndex()
-if not parent.isValid():
+parentItem = (
-parentItem = self.rootItem
+parent.internalPointer()
-else:
+if parent.isValid() else
-parentItem = parent.internalPointer()
+self.rootItem
+)
 try:
 if not parentItem.isPopulated():
 self.populateItem(parentItem)
 childItem = parentItem.child(row)
 continue
 cnt = itm.childCount()
 self.beginInsertRows(
 self.createIndex(itm.row(), 0, itm), cnt, cnt)
-if f.isDir():
+node = (
-node = BrowserDirectoryItem(
+BrowserDirectoryItem(
 itm,
 Utilities.toNativeSeparators(f.absoluteFilePath()),
 False)
-else:
+if f.isDir() else
-node = BrowserFileItem(
+BrowserFileItem(
 itm,
 Utilities.toNativeSeparators(f.absoluteFilePath()))
+)
 self._addItem(node, itm)
 self.endInsertRows()
 # step 2: check for removed entries
 if len(entryInfoList) != itm.childCount():
 @param parent index of parent item (QModelIndex)
 """
 if parent is None:
 parent = QModelIndex()
-if not parent.isValid():
+parentItem = (
-parentItem = self.rootItem
+parent.internalPointer()
-else:
+if parent.isValid() else
-parentItem = parent.internalPointer()
+self.rootItem
+)
 cnt = parentItem.childCount()
 self.beginInsertRows(parent, cnt, cnt)
 self._addItem(itm, parentItem)
 self.endInsertRows()
 if repopulate:
 self.beginInsertRows(
 self.createIndex(parentItem.row(), 0, parentItem),
 0, len(syspath) - 1)
 for p in syspath:
-if os.path.isdir(p):
+node = (
-node = BrowserDirectoryItem(parentItem, p)
+BrowserDirectoryItem(parentItem, p)
-else:
+if os.path.isdir(p) else
-node = BrowserFileItem(parentItem, p)
+BrowserFileItem(parentItem, p)
+)
 self._addItem(node, parentItem)
 if repopulate:
 self.endInsertRows()
 else:
 proc.kill()
 for key in keys:
 if key.startswith("@@"):
 # special treatment done later
 continue
 cl = dictionary[key]
-try:
+with contextlib.suppress(AttributeError):
 if cl.module == moduleName:
 node = BrowserClassItem(parentItem, cl, fileName)
 self._addItem(node, parentItem)
-except AttributeError:
-pass
 if "@@Coding@@" in keys and Preferences.getUI("BrowserShowCoding"):
 node = BrowserCodingItem(
 parentItem,
 QCoreApplication.translate("BrowserModel", "Coding: {0}")
 .format(dictionary["@@Coding@@"].coding),
 self._addItem(node, parentItem)
 if repopulate:
 self.endInsertRows()
-class BrowserItem(object):
+class BrowserItem:
 """
 Class implementing the data structure for browser items.
 """
 def __init__(self, parent, data):
 """
 @param parent parent item
 @param dinfo dinfo is the string for the directory (string)
 @param full flag indicating full pathname should be displayed (boolean)
 """
 self._dirName = os.path.abspath(dinfo)
+dn = self._dirName if full else os.path.basename(self._dirName)
-if full:
-dn = self._dirName
-else:
-dn = os.path.basename(self._dirName)
 BrowserItem.__init__(self, parent, dn)
 self.type_ = BrowserItemDirectory
 if (
 not Utilities.isDrive(self._dirName) and
 @param dinfo dinfo is the string for the directory (string)
 @param full flag indicating full pathname should be displayed (boolean)
 """
 self._dirName = os.path.abspath(dinfo)
+dn = self._dirName if full else os.path.basename(self._dirName)
-if full:
-dn = self._dirName
-else:
-dn = os.path.basename(self._dirName)
 self.itemData[0] = dn
 def dirName(self):
 """
 Public method returning the directory name.
 @param other reference to item to compare against (BrowserItem)
 @param column column number to use for the comparison (integer)
 @param order sort order (Qt.SortOrder) (for special sorting)
 @return true, if this item is less than other (boolean)
 """
-if issubclass(other.__class__, BrowserFileItem):
+if (
-if Preferences.getUI("BrowsersListFoldersFirst"):
+issubclass(other.__class__, BrowserFileItem) and
-return order == Qt.SortOrder.AscendingOrder
+Preferences.getUI("BrowsersListFoldersFirst")
+):
+return order == Qt.SortOrder.AscendingOrder
 return BrowserItem.lessThan(self, other, column, order)
 class BrowserSysPathItem(BrowserItem):
 self._dirName = os.path.dirname(finfo)
 self.sourceLanguage = sourceLanguage
 self._moduleName = ''
+# TODO: add icon for eric graphics file
 pixName = ""
 if self.isPython3File():
 pixName = "filePython"
 self._populated = False
 self._lazyPopulation = True
 def isRubyFile(self):
 """
 Public method to check, if this file is a Ruby script.
-@return flag indicating a Ruby file (boolean)
+@return flag indicating a Ruby file
+@rtype bool
 """
 return (
 self.fileext == '.rb' or
 (self.fileext == "" and self.sourceLanguage == "Ruby")
 )
 def isDesignerFile(self):
 """
 Public method to check, if this file is a Qt-Designer file.
-@return flag indicating a Qt-Designer file (boolean)
+@return flag indicating a Qt-Designer file
+@rtype bool
 """
 return self.fileext == '.ui'
 def isLinguistFile(self):
 """
 Public method to check, if this file is a Qt-Linguist file.
-@return flag indicating a Qt-Linguist file (boolean)
+@return flag indicating a Qt-Linguist file
+@rtype bool
 """
 return self.fileext in ['.ts', '.qm']
 def isResourcesFile(self):
 """
 Public method to check, if this file is a Qt-Resources file.
-@return flag indicating a Qt-Resources file (boolean)
+@return flag indicating a Qt-Resources file
+@rtype bool
 """
 return self.fileext == '.qrc'
 def isProjectFile(self):
 """
 Public method to check, if this file is an eric project file.
-@return flag indicating an eric project file (boolean)
+@return flag indicating an eric project file
+@rtype bool
 """
 return self.fileext in ('.epj', '.e4p')
 def isMultiProjectFile(self):
 """
 Public method to check, if this file is an eric multi project file.
-@return flag indicating an eric project file (boolean)
+@return flag indicating an eric project file
+@rtype bool
 """
 return self.fileext in ('.emj', '.e4m', '.e5m')
 def isIdlFile(self):
 """
 Public method to check, if this file is a CORBA IDL file.
-@return flag indicating a CORBA IDL file (boolean)
+@return flag indicating a CORBA IDL file
+@rtype bool
 """
 return self.fileext == '.idl'
 def isProtobufFile(self):
 """
 def isJavaScriptFile(self):
 """
 Public method to check, if this file is a JavaScript file.
-@return flag indicating a JavaScript file (boolean)
+@return flag indicating a JavaScript file
+@rtype bool
 """
 return self.fileext == '.js'
 def isPixmapFile(self):
 """
 Public method to check, if this file is a pixmap file.
-@return flag indicating a pixmap file (boolean)
+@return flag indicating a pixmap file
+@rtype bool
 """
 return self.fileext[1:] in QImageReader.supportedImageFormats()
 def isSvgFile(self):
 """
 Public method to check, if this file is a SVG file.
-@return flag indicating a SVG file (boolean)
+@return flag indicating a SVG file
+@rtype bool
 """
 return self.fileext == '.svg'
 def isDFile(self):
 """
 return (
 self.fileext in ['.d', '.di'] or
 (self.fileext == "" and self.sourceLanguage == "D")
 )
+def isEricGraphicsFile(self):
+"""
+Public method to check, if this is an eric graphics file.
+@return flag indicating an eric graphics file
+@rtype bool
+"""
+return self.fileext in ('.egj', '.e5g')
 def lessThan(self, other, column, order):
 """
 Public method to check, if the item is less than the other one.
 @param other reference to item to compare against (BrowserItem)
 @param column column number to use for the comparison (integer)
 @param order sort order (Qt.SortOrder) (for special sorting)
 @return true, if this item is less than other (boolean)
 """
-if not issubclass(other.__class__, BrowserFileItem):
+if (
-if Preferences.getUI("BrowsersListFoldersFirst"):
+not issubclass(other.__class__, BrowserFileItem) and
-return order == Qt.SortOrder.DescendingOrder
+Preferences.getUI("BrowsersListFoldersFirst")
+):
+return order == Qt.SortOrder.DescendingOrder
 if issubclass(other.__class__, BrowserFileItem):
 sinit = os.path.basename(self._filename).startswith('__init__.py')
 oinit = os.path.basename(other.fileName()).startswith(
 '__init__.py')
 if sup.module != cl.module:
 sname = "{0}.{1}".format(sup.module, sname)
 except AttributeError:
 sname = sup
 supers.append(sname)
-name = name + "({0})".format(", ".join(supers))
+name += "({0})".format(", ".join(supers))
 BrowserItem.__init__(self, parent, name)
 self.type_ = BrowserItemClass
 self._name = name

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/BrowserModel.py

eric6/UI/BrowserModel.py