diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Wed Jul 13 14:55:47 2022 +0200
@@ -18,40 +18,41 @@
Class implementing a dialog mixin providing common callback methods for
the pysvn client.
"""
+
def __init__(self, log=""):
"""
Constructor
-
+
@param log optional log message (string)
"""
self.shouldCancel = False
self.logMessage = log
-
+
def _cancel(self):
"""
Protected method to request a cancellation of the current action.
"""
self.shouldCancel = True
-
+
def _reset(self):
"""
Protected method to reset the internal state of the dialog.
"""
self.shouldCancel = False
-
+
def _clientCancelCallback(self):
"""
Protected method called by the client to check for cancellation.
-
+
@return flag indicating a cancellation
"""
QApplication.processEvents()
return self.shouldCancel
-
+
def _clientLoginCallback(self, realm, username, may_save):
"""
Protected method called by the client to get login information.
-
+
@param realm name of the realm of the requested credentials (string)
@param username username as supplied by subversion (string)
@param may_save flag indicating, that subversion is willing to save
@@ -63,23 +64,23 @@
password should be saved.
"""
from .SvnLoginDialog import SvnLoginDialog
-
+
with EricOverridenCursor():
parent = isinstance(self, QWidget) and self or None
dlg = SvnLoginDialog(realm, username, may_save, parent)
res = dlg.exec()
-
+
if res == QDialog.DialogCode.Accepted:
loginData = dlg.getData()
return (True, loginData[0], loginData[1], loginData[2])
else:
return (False, "", "", False)
-
+
def _clientSslServerTrustPromptCallback(self, trust_dict):
"""
Protected method called by the client to request acceptance for a
ssl server certificate.
-
+
@param trust_dict dictionary containing the trust data
@return tuple of three values (retcode, acceptedFailures, save).
Retcode should be true, if the certificate should be accepted,
@@ -93,43 +94,51 @@
msgBox = EricMessageBox.EricMessageBox(
EricMessageBox.Question,
self.tr("Subversion SSL Server Certificate"),
- self.tr("""<p>Accept the following SSL certificate?</p>"""
- """<table>"""
- """<tr><td>Realm:</td><td>{0}</td></tr>"""
- """<tr><td>Hostname:</td><td>{1}</td></tr>"""
- """<tr><td>Fingerprint:</td><td>{2}</td></tr>"""
- """<tr><td>Valid from:</td><td>{3}</td></tr>"""
- """<tr><td>Valid until:</td><td>{4}</td></tr>"""
- """<tr><td>Issuer name:</td><td>{5}</td></tr>"""
- """</table>""")
- .format(trust_dict["realm"],
- trust_dict["hostname"],
- trust_dict["finger_print"],
- trust_dict["valid_from"],
- trust_dict["valid_until"],
- trust_dict["issuer_dname"]),
- modal=True, parent=parent)
- permButton = msgBox.addButton(self.tr("&Permanent accept"),
- EricMessageBox.AcceptRole)
- tempButton = msgBox.addButton(self.tr("&Temporary accept"),
- EricMessageBox.AcceptRole)
+ self.tr(
+ """<p>Accept the following SSL certificate?</p>"""
+ """<table>"""
+ """<tr><td>Realm:</td><td>{0}</td></tr>"""
+ """<tr><td>Hostname:</td><td>{1}</td></tr>"""
+ """<tr><td>Fingerprint:</td><td>{2}</td></tr>"""
+ """<tr><td>Valid from:</td><td>{3}</td></tr>"""
+ """<tr><td>Valid until:</td><td>{4}</td></tr>"""
+ """<tr><td>Issuer name:</td><td>{5}</td></tr>"""
+ """</table>"""
+ ).format(
+ trust_dict["realm"],
+ trust_dict["hostname"],
+ trust_dict["finger_print"],
+ trust_dict["valid_from"],
+ trust_dict["valid_until"],
+ trust_dict["issuer_dname"],
+ ),
+ modal=True,
+ parent=parent,
+ )
+ permButton = msgBox.addButton(
+ self.tr("&Permanent accept"), EricMessageBox.AcceptRole
+ )
+ tempButton = msgBox.addButton(
+ self.tr("&Temporary accept"), EricMessageBox.AcceptRole
+ )
msgBox.addButton(self.tr("&Reject"), EricMessageBox.RejectRole)
msgBox.exec()
-
+
if msgBox.clickedButton() == permButton:
return (True, trust_dict["failures"], True)
elif msgBox.clickedButton() == tempButton:
return (True, trust_dict["failures"], False)
else:
return (False, 0, False)
-
+
def _clientLogCallback(self):
"""
Protected method called by the client to request a log message.
-
+
@return a flag indicating success and the log message (string)
"""
from .SvnCommitDialog import SvnCommitDialog
+
if self.logMessage:
return True, self.logMessage
else:
