Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Sat May 01 14:27:20 2021 +0200
@@ -37,7 +37,7 @@
         
         @param vcs reference to the Mercurial vcs object
         """
-        super(Queues, self).__init__(vcs)
+        super().__init__(vcs)
         
         self.qdiffDialog = None
         self.qheaderDialog = None
@@ -81,14 +81,17 @@
         """
         patchesList = []
         
+        if listType not in (Queues.APPLIED_LIST, Queues.UNAPPLIED_LIST,
+                            Queues.SERIES_LIST):
+            raise ValueError("illegal value for listType")
+        
         if listType == Queues.APPLIED_LIST:
             args = self.vcs.initCommand("qapplied")
         elif listType == Queues.UNAPPLIED_LIST:
             args = self.vcs.initCommand("qunapplied")
-        elif listType == Queues.SERIES_LIST:
+        else:
             args = self.vcs.initCommand("qseries")
-        else:
-            raise ValueError("illegal value for listType")
+        
         if withSummary:
             args.append("--summary")
         
@@ -277,6 +280,9 @@
         @return flag indicating that the project should be reread (boolean)
         @exception ValueError raised to indicate an invalid operation
         """
+        if operation not in (Queues.POP, Queues.PUSH, Queues.GOTO):
+            raise ValueError("illegal value for operation")
+        
         if operation == Queues.POP:
             args = self.vcs.initCommand("qpop")
             title = self.tr("Pop Patches")
@@ -285,12 +291,11 @@
             args = self.vcs.initCommand("qpush")
             title = self.tr("Push Patches")
             listType = Queues.UNAPPLIED_LIST
-        elif operation == Queues.GOTO:
+        else:
             args = self.vcs.initCommand("qgoto")
             title = self.tr("Go to Patch")
             listType = Queues.SERIES_LIST
-        else:
-            raise ValueError("illegal value for operation")
+        
         args.append("-v")
         if force:
             args.append("--force")
@@ -559,13 +564,15 @@
         
         @param isCreate flag indicating to create a new queue (boolean)
         """
-        if isCreate:
-            title = self.tr("Create New Queue")
-        else:
-            title = self.tr("Rename Active Queue")
         from .HgQueuesQueueManagementDialog import (
             HgQueuesQueueManagementDialog
         )
+        
+        title = (
+            self.tr("Create New Queue")
+            if isCreate else
+            self.tr("Rename Active Queue")
+        )
         dlg = HgQueuesQueueManagementDialog(
             HgQueuesQueueManagementDialog.NAME_INPUT,
             title, False, self.vcs)
@@ -609,14 +616,16 @@
             Queues.QUEUE_PURGE, Queues.QUEUE_ACTIVATE)
         @exception ValueError raised to indicate an invalid operation
         """
+        if operation not in (Queues.QUEUE_PURGE, Queues.QUEUE_DELETE,
+                             Queues.QUEUE_ACTIVATE):
+            raise ValueError("illegal value for operation")
+        
         if operation == Queues.QUEUE_PURGE:
             title = self.tr("Purge Queue")
         elif operation == Queues.QUEUE_DELETE:
             title = self.tr("Delete Queue")
-        elif operation == Queues.QUEUE_ACTIVATE:
+        else:
             title = self.tr("Activate Queue")
-        else:
-            raise ValueError("illegal value for operation")
         
         from .HgQueuesQueueManagementDialog import (
             HgQueuesQueueManagementDialog