Mercurial Repositories > Time Tracker / changeset

--- a/ChangeLog	Sun Apr 25 17:13:50 2021 +0200
+++ b/ChangeLog	Sun Apr 25 17:29:38 2021 +0200
@@ -2,6 +2,7 @@
 ---------
 Version 4.0.0:
 - removed support for outdated eric6 versions
+- implemented some code simplifications
 
 Version 3.1.0:
 - changed exec_() into exec()

--- a/PluginTimeTracker.epj	Sun Apr 25 17:13:50 2021 +0200
+++ b/PluginTimeTracker.epj	Sun Apr 25 17:29:38 2021 +0200
@@ -8,8 +8,21 @@
     "CHECKERSPARMS": {
       "Pep8Checker": {
         "AnnotationsChecker": {
+          "AllowUntypedDefs": false,
+          "AllowUntypedNested": false,
+          "DispatchDecorators": [
+            "singledispatch",
+            "singledispatchmethod"
+          ],
           "MaximumComplexity": 3,
-          "MinimumCoverage": 75
+          "MaximumLength": 7,
+          "MinimumCoverage": 75,
+          "MypyInitReturn": false,
+          "OverloadDecorators": [
+            "overload"
+          ],
+          "SuppressDummyArgs": false,
+          "SuppressNoneReturning": true
         },
         "BlankLines": [
           2,
@@ -27,20 +40,35 @@
           ]
         },
         "CommentedCodeChecker": {
-          "Aggressive": false
+          "Aggressive": false,
+          "WhiteList": [
+            "pylint",
+            "pyright",
+            "noqa",
+            "type:\\s*ignore",
+            "fmt:\\s*(on|off)",
+            "TODO",
+            "FIXME",
+            "WARNING",
+            "NOTE",
+            "TEST",
+            "DOCU",
+            "XXX",
+            "- "
+          ]
         },
         "CopyrightAuthor": "",
         "CopyrightMinFileSize": 0,
         "DocstringType": "eric",
-        "EnabledCheckerCategories": "C, D, E, M, N, S, W",
+        "EnabledCheckerCategories": "C, D, E, M, N, S, Y, W",
         "ExcludeFiles": "*/Ui_*.py, */*_rc.py,",
-        "ExcludeMessages": "C101,E265,E266,E305,E402,M201,M811,N802,N803,N807,N808,N821,W293,W504",
+        "ExcludeMessages": "C101,E265,E266,E305,E402,M201,M301,M302,M303,M304,M305,M306,M307,M308,M311,M312,M313,M314,M315,M321,M701,M702,M811,M834,N802,N803,N807,N808,N821,W293,W504,Y119,Y401,Y402",
         "FixCodes": "",
         "FixIssues": false,
         "FutureChecker": "",
         "HangClosing": false,
         "IncludeMessages": "",
-        "LineComplexity": 20,
+        "LineComplexity": 25,
         "LineComplexityScore": 10,
         "MaxCodeComplexity": 10,
         "MaxDocLineLength": 79,

--- a/PluginTimeTracker.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/PluginTimeTracker.py	Sun Apr 25 17:29:38 2021 +0200
@@ -61,14 +61,12 @@
     try:
         usesDarkPalette = e5App().usesDarkPalette()
     except AttributeError:
+        # backward compatibility for eric6 < 20.04
         from PyQt5.QtGui import QPalette
         palette = e5App().palette()
         lightness = palette.color(QPalette.Window).lightness()
         usesDarkPalette = lightness <= 128
-    if usesDarkPalette:
-        iconSuffix = "dark"
-    else:
-        iconSuffix = "light"
+    iconSuffix = "dark" if usesDarkPalette else "light"
     
     return {
         "timeTrackerPage": [
@@ -135,14 +133,12 @@
         try:
             usesDarkPalette = e5App().usesDarkPalette()
         except AttributeError:
+            # backward compatibility for eric6 < 20.04
             from PyQt5.QtGui import QPalette
             palette = e5App().palette()
             lightness = palette.color(QPalette.Window).lightness()
             usesDarkPalette = lightness <= 128
-        if usesDarkPalette:
-            iconSuffix = "dark"
-        else:
-            iconSuffix = "light"
+        iconSuffix = "dark" if usesDarkPalette else "light"
         
         self.__object = TimeTracker(self, iconSuffix, self.__ui)
         self.__object.activate()

--- a/TimeTracker/ConfigurationPage/TimeTrackerPage.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/TimeTracker/ConfigurationPage/TimeTrackerPage.py	Sun Apr 25 17:29:38 2021 +0200
@@ -23,7 +23,7 @@
         
         @param plugin reference to the plugin object
         """
-        super(TimeTrackerPage, self).__init__()
+        super().__init__()
         self.setupUi(self)
         self.setObjectName("TimeTrackerPage")
         

--- a/TimeTracker/TimeTrackEntry.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/TimeTracker/TimeTrackEntry.py	Sun Apr 25 17:29:38 2021 +0200
@@ -10,7 +10,7 @@
 from PyQt5.QtCore import Qt, QDateTime, QTime
 
 
-class TimeTrackEntry(object):
+class TimeTrackEntry:
     """
     Class implementing the time track entry.
     """

--- a/TimeTracker/TimeTracker.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/TimeTracker/TimeTracker.py	Sun Apr 25 17:29:38 2021 +0200
@@ -179,11 +179,11 @@
         """
         if not filePath:
             filePath = self.__trackerFilePath
-        if ids:
-            entriesList = [self.__entries[eid] for eid in ids
-                           if eid in self.__entries]
-        else:
-            entriesList = self.__entries.values()
+        entriesList = (
+            [self.__entries[eid] for eid in ids if eid in self.__entries]
+            if ids else
+            self.__entries.values()
+        )
         try:
             with open(filePath, "w", encoding="utf-8") as f:
                 for entry in entriesList:
@@ -236,14 +236,14 @@
                     entries.remove(entry)
                     duplicateCount += 1
         
-        if len(self.__entries.keys()):
-            nextID = max(self.__entries.keys()) + 1
-        else:
-            nextID = 0
-        for entry in entries:
+        start = (
+            max(self.__entries.keys()) + 1
+            if len(self.__entries.keys()) else
+            0
+        )
+        for nextID, entry in enumerate(entries, start=start):
             entry.setID(nextID)
             self.__entries[nextID] = entry
-            nextID += 1
         
         if self.__plugin.getPreferences("AutoSave"):
             self.saveTrackerEntries()
@@ -298,10 +298,11 @@
         if duration < self.__plugin.getPreferences("MinimumDuration"):
             return
         
-        if len(self.__entries.keys()):
-            nextID = max(self.__entries.keys()) + 1
-        else:
-            nextID = 0
+        nextID = (
+            max(self.__entries.keys()) + 1
+            if len(self.__entries.keys()) else
+            0
+        )
         
         from .TimeTrackEntry import TimeTrackEntry
         
@@ -411,11 +412,9 @@
                 entries[dt] = entry
         
         self.__entries = {}
-        nextID = 0
-        for entry in sorted(entries.values()):
+        for nextID, entry in enumerate(sorted(entries.values())):
             entry.setID(nextID)
             self.__entries[nextID] = entry
-            nextID += 1
         
         if self.__plugin.getPreferences("AutoSave"):
             self.saveTrackerEntries()
@@ -441,11 +440,9 @@
                 entries[dt] = entry
         
         self.__entries = {}
-        nextID = 0
-        for entry in sorted(entries.values()):
+        for nextID, entry in enumerate(sorted(entries.values())):
             entry.setID(nextID)
             self.__entries[nextID] = entry
-            nextID += 1
         
         if self.__plugin.getPreferences("AutoSave"):
             self.saveTrackerEntries()

--- a/TimeTracker/TimeTrackerEntryDialog.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/TimeTracker/TimeTrackerEntryDialog.py	Sun Apr 25 17:29:38 2021 +0200
@@ -29,7 +29,7 @@
             comment combo box (list of strings)
         @param parent reference to the parent widget (QWidget)
         """
-        super(TimeTrackerEntryDialog, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         
         self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(False)

--- a/TimeTracker/TimeTrackerWidget.py	Sun Apr 25 17:13:50 2021 +0200
+++ b/TimeTracker/TimeTrackerWidget.py	Sun Apr 25 17:29:38 2021 +0200
@@ -36,7 +36,7 @@
         @param tracker reference to the time tracker (TimeTracker)
         @param parent reference to the parent widget (QWidget)
         """
-        super(TimeTrackerWidget, self).__init__(parent)
+        super().__init__(parent)
         self.setupUi(self)
         
         self.__tracker = tracker