eric7/PluginManager/PluginInstallDialog.py

branch
eric7
changeset 9152
8a68afaf1ba2
parent 8943
23f9c7b9e18e
--- a/eric7/PluginManager/PluginInstallDialog.py	Wed Jun 15 09:44:07 2022 +0200
+++ b/eric7/PluginManager/PluginInstallDialog.py	Thu Jun 16 18:28:59 2022 +0200
@@ -11,13 +11,14 @@
 import contextlib
 import glob
 import os
+import pathlib
 import shutil
 import sys
 import time
 import urllib.parse
 import zipfile
 
-from PyQt6.QtCore import pyqtSlot, Qt, QDir, QFileInfo
+from PyQt6.QtCore import pyqtSlot, Qt
 from PyQt6.QtWidgets import (
     QWidget, QDialogButtonBox, QAbstractButton, QApplication, QDialog,
     QVBoxLayout
@@ -88,13 +89,12 @@
         
         self.__restartNeeded = False
         
-        downloadDir = QDir(Preferences.getPluginManager("DownloadPath"))
+        downloadDir = Preferences.getPluginManager("DownloadPath")
         for pluginFileName in pluginFileNames:
-            fi = QFileInfo(pluginFileName)
-            if fi.isRelative():
-                pluginFileName = QFileInfo(
-                    downloadDir, fi.fileName()).absoluteFilePath()
-            self.archivesList.addItem(pluginFileName)
+            pluginFilePath = pathlib.Path(pluginFileName)
+            if not pluginFilePath.is_absolute():
+                pluginFilePath = downloadDir / pluginFilePath
+            self.archivesList.addItem(str(pluginFilePath))
             self.archivesList.sortItems()
         
         self.__currentIndex = 0

eric ide

mercurial