Mercurial Repositories > Time Tracker / changeset

--- a/ChangeLog	Tue Jun 23 19:40:46 2020 +0200
+++ b/ChangeLog	Wed Oct 14 19:19:53 2020 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 3.1.0:
+- changed exec_() into exec()
+
 Version 3.0.0:
 - removed support for Python2
 

--- a/PluginTimeTracker.py	Tue Jun 23 19:40:46 2020 +0200
+++ b/PluginTimeTracker.py	Wed Oct 14 19:19:53 2020 +0200
@@ -22,7 +22,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "3.0.0"
+version = "3.1.0"
 className = "TimeTrackerPlugin"
 packageName = "TimeTracker"
 shortDescription = "Time Tracker to keep track of the project time."

Binary file PluginTimeTracker.zip has changed

--- a/TimeTracker/TimeTracker.py	Tue Jun 23 19:40:46 2020 +0200
+++ b/TimeTracker/TimeTracker.py	Wed Oct 14 19:19:53 2020 +0200
@@ -138,9 +138,8 @@
         """
         if os.path.exists(self.__trackerFilePath):
             try:
-                f = open(self.__trackerFilePath, "r", encoding="utf-8")
-                data = f.read()
-                f.close()
+                with open(self.__trackerFilePath, "r", encoding="utf-8") as f:
+                    data = f.read()
             except (IOError, OSError) as err:
                 E5MessageBox.critical(
                     self.__ui,
@@ -186,11 +185,10 @@
         else:
             entriesList = self.__entries.values()
         try:
-            f = open(filePath, "w", encoding="utf-8")
-            for entry in entriesList:
-                if entry.isValid():
-                    f.write(entry.toString() + "\n")
-            f.close()
+            with open(filePath, "w", encoding="utf-8") as f:
+                for entry in entriesList:
+                    if entry.isValid():
+                        f.write(entry.toString() + "\n")
         except (IOError, OSError) as err:
             E5MessageBox.critical(
                 self.__ui,
@@ -206,9 +204,8 @@
         @param fname name of the file to import (string)
         """
         try:
-            f = open(fname, "r", encoding="utf-8")
-            data = f.read()
-            f.close()
+            with open(fname, "r", encoding="utf-8") as f:
+                data = f.read()
         except (IOError, OSError) as err:
             E5MessageBox.critical(
                 self.__ui,

--- a/TimeTracker/TimeTrackerWidget.py	Tue Jun 23 19:40:46 2020 +0200
+++ b/TimeTracker/TimeTrackerWidget.py	Wed Oct 14 19:19:53 2020 +0200
@@ -149,7 +149,7 @@
         menu.addSeparator()
         menu.addAction(self.tr("Remove duplicates"), self.__removeDuplicates)
         menu.addAction(self.tr("Merge duplicates"), self.__mergeDuplicates)
-        menu.exec_(QCursor.pos())
+        menu.exec(QCursor.pos())
     
     def __addEntry(self):
         """
@@ -164,7 +164,7 @@
         for index in range(self.commentCombo.count()):
             comments.append(self.commentCombo.itemText(index))
         dlg = TimeTrackerEntryDialog(self.__tracker, None, tasks, comments)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.__tracker.addTrackerEntry(*dlg.getData())
     
     def __editEntry(self):
@@ -187,7 +187,7 @@
                     comments.append(self.commentCombo.itemText(index))
                 dlg = TimeTrackerEntryDialog(self.__tracker, entry, tasks,
                                              comments)
-                if dlg.exec_() == QDialog.Accepted:
+                if dlg.exec() == QDialog.Accepted:
                     start, duration, task, comment = dlg.getData()
                     
                     entry.setStartDateTime(start)