diff -r 27f636beebad -r 2c730d5fd177 eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py
--- a/eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Tue Mar 02 17:17:09 2021 +0100
@@ -71,7 +71,8 @@
self.__loadClassifiersFromPyPI()
- self.__okButton = self.buttonBox.button(QDialogButtonBox.Ok)
+ self.__okButton = self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Ok)
self.__okButton.setEnabled(False)
projectOpen = e5App().getObject("Project").isOpen()
@@ -109,8 +110,9 @@
from PyPI.
"""
request = QNetworkRequest(QUrl(SetupWizardDialog.ClassifiersUrl))
- request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
- QNetworkRequest.AlwaysNetwork)
+ request.setAttribute(
+ QNetworkRequest.Attribute.CacheLoadControlAttribute,
+ QNetworkRequest.CacheLoadControl.AlwaysNetwork)
reply = e5App().getObject("UserInterface").networkAccessManager().get(
request)
reply.finished.connect(lambda: self.__classifiersDownloadDone(reply))
@@ -128,7 +130,7 @@
reply.deleteLater()
if reply in self.__replies:
self.__replies.remove(reply)
- if reply.error() == QNetworkReply.NoError:
+ if reply.error() == QNetworkReply.NetworkError.NoError:
ioEncoding = Preferences.getSystem("IOEncoding")
lines = str(reply.readAll(), ioEncoding, 'replace').splitlines()
@@ -191,7 +193,10 @@
self.licenseClassifierComboBox.setCurrentIndex(
self.licenseClassifierComboBox.findText(
- "(GPLv3)", Qt.MatchContains | Qt.MatchCaseSensitive))
+ "(GPLv3)",
+ Qt.MatchFlag.MatchContains | Qt.MatchFlag.MatchCaseSensitive
+ )
+ )
def __addClassifierEntry(self, line):
"""
@@ -215,8 +220,8 @@
self.__classifiersDict[key] = itm
else:
pitm = self.__classifiersDict[key]
- itm.setCheckState(0, Qt.Unchecked)
- itm.setData(0, Qt.UserRole, line)
+ itm.setCheckState(0, Qt.CheckState.Unchecked)
+ itm.setData(0, Qt.ItemDataRole.UserRole, line)
def __getLicenseText(self):
"""
@@ -368,8 +373,8 @@
itm = self.classifiersList.topLevelItem(0)
while itm:
itm.setExpanded(True)
- if itm.checkState(0) == Qt.Checked:
- classifiers.append(itm.data(0, Qt.UserRole))
+ if itm.checkState(0) == Qt.CheckState.Checked:
+ classifiers.append(itm.data(0, Qt.ItemDataRole.UserRole))
itm = self.classifiersList.itemBelow(itm)
# cleanup classifiers list - remove all invalid entries
@@ -759,7 +764,9 @@
self.excludePatternEdit.text().replace("\\", ".").replace("/", ".")
)
if not self.excludePatternList.findItems(
- pattern, Qt.MatchExactly | Qt.MatchCaseSensitive):
+ pattern,
+ Qt.MatchFlag.MatchExactly | Qt.MatchFlag.MatchCaseSensitive
+ ):
QListWidgetItem(pattern, self.excludePatternList)
@pyqtSlot(str)
