eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py

changeset 8243
cc717c2ae956
parent 8234
fcb6b4b96274
child 8259
2bbec88047dd
diff -r aa713ac50c0d -r cc717c2ae956 eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py	Thu Apr 15 16:52:05 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py	Thu Apr 15 18:11:24 2021 +0200
@@ -12,6 +12,7 @@
 import shutil
 import time
 from urllib.parse import quote
+import contextlib
 
 from PyQt5.QtCore import pyqtSignal, Qt, QDateTime, QCoreApplication
 from PyQt5.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
@@ -1479,7 +1480,7 @@
                 mixin._clientSslServerTrustPromptCallback
             )
             
-            try:
+            with contextlib.suppress(pysvn.ClientError):
                 with E5MutexLocker(self.vcsExecutionMutex):
                     allFiles = client.status(dname, recurse=True, get_all=True,
                                              ignore=True, update=False)
@@ -1512,9 +1513,6 @@
                                     break
                     else:
                         self.statusCache[name] = self.canBeAdded
-            except pysvn.ClientError:
-                # ignore pysvn errors
-                pass
         
         return names
         
@@ -1559,7 +1557,7 @@
                 mixin._clientSslServerTrustPromptCallback
             )
             
-            try:
+            with contextlib.suppress(pysvn.ClientError):
                 with E5MutexLocker(self.vcsExecutionMutex):
                     allFiles = client.status(dname, recurse=True, get_all=True,
                                              ignore=True, update=False)
@@ -1571,9 +1569,6 @@
                         self.statusCache[name] = self.canBeCommitted
                     else:
                         self.statusCache[name] = self.canBeAdded
-            except pysvn.ClientError:
-                # ignore pysvn errors
-                pass
         
         return names
         
@@ -2455,7 +2450,7 @@
         client = self.getClient()
         if hasattr(client, 'get_changelist'):
             ppath = e5App().getObject("Project").getProjectPath()
-            try:
+            with contextlib.suppress(pysvn.ClientError):
                 with E5MutexLocker(self.vcsExecutionMutex):
                     entries = client.get_changelist(
                         ppath, depth=pysvn.depth.infinity)
@@ -2463,8 +2458,6 @@
                     changelist = entry[1]
                     if changelist not in changelists:
                         changelists.append(changelist)
-            except pysvn.ClientError:
-                pass
         
         return changelists
         

eric ide

mercurial