Mercurial Repositories > Django Tags Menu / changeset

--- a/ChangeLog	Tue Jun 23 17:52:47 2020 +0200
+++ b/ChangeLog	Wed Oct 14 18:55:22 2020 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 3.1.0:
+- changed exec_() into exec()
+
 Version 3.0.0:
 - removed support for Python2
 

--- a/PluginProjectDjangoTagsMenu.py	Tue Jun 23 17:52:47 2020 +0200
+++ b/PluginProjectDjangoTagsMenu.py	Wed Oct 14 18:55:22 2020 +0200
@@ -21,7 +21,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "3.0.0"
+version = "3.1.0"
 className = "ProjectDjangoTagsMenuPlugin"
 packageName = "ProjectDjangoTagsMenu"
 shortDescription = "Tags menu for Django projects."

Binary file PluginProjectDjangoTagsMenu.zip has changed

--- a/ProjectDjangoTagsMenu/DjangoTagInputDialog.py	Tue Jun 23 17:52:47 2020 +0200
+++ b/ProjectDjangoTagsMenu/DjangoTagInputDialog.py	Wed Oct 14 18:55:22 2020 +0200
@@ -87,7 +87,7 @@
         
         dlg = DjangoTagInputDialog(labels, defaults, parent)
         dlg.setWindowTitle(title)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             return dlg.getData(), True
         else:
             return (), False

--- a/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py	Tue Jun 23 17:52:47 2020 +0200
+++ b/ProjectDjangoTagsMenu/DjangoTagsMenuHandler.py	Wed Oct 14 18:55:22 2020 +0200
@@ -811,7 +811,7 @@
         elif tag == "if":
             from .IfTagInputDialog import IfTagInputDialog
             dlg = IfTagInputDialog()
-            if dlg.exec_() == QDialog.Accepted:
+            if dlg.exec() == QDialog.Accepted:
                 templateText = dlg.getTag()
         elif tag == "ifchanged":
             data, ok = DjangoTagInputDialog.getText(
@@ -1311,7 +1311,7 @@
         elif tag == "lorem":
             from .LoremTagInputDialog import LoremTagInputDialog
             dlg = LoremTagInputDialog()
-            if dlg.exec_() == QDialog.Accepted:
+            if dlg.exec() == QDialog.Accepted:
                 templateText = "{{% {0} %}}".format(dlg.getTag())
         
         ####################################################
@@ -1383,9 +1383,8 @@
                 self.tr("All Files (*)"))
             if filename:
                 try:
-                    f = open(filename, "r", encoding="utf-8")
-                    comment = f.read()
-                    f.close()
+                    with open(filename, "r", encoding="utf-8") as f:
+                        comment = f.read()
                     templateText = (
                         '{{% comment %}} {0} {{% endcomment %}}'.format(
                             comment))

--- a/ProjectDjangoTagsMenu/IeCommentDialog.py	Tue Jun 23 17:52:47 2020 +0200
+++ b/ProjectDjangoTagsMenu/IeCommentDialog.py	Wed Oct 14 18:55:22 2020 +0200
@@ -52,7 +52,7 @@
             state (boolean)
         """
         dlg = IeCommentDialog()
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             condition, version = dlg.getData()
             tag = '[if{0} IE {1}]> {2} <![endif]'.format(
                 condition, version, selectedText)

--- a/ProjectDjangoTagsMenu/MultiLineInputDialog.py	Tue Jun 23 17:52:47 2020 +0200
+++ b/ProjectDjangoTagsMenu/MultiLineInputDialog.py	Wed Oct 14 18:55:22 2020 +0200
@@ -50,7 +50,7 @@
         """
         dlg = MultiLineInputDialog(label, default, parent)
         dlg.setWindowTitle(title)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             return dlg.getData(), True
         else:
             return "", False

--- a/ProjectDjangoTagsMenu/TimezoneSelectionDialog.py	Tue Jun 23 17:52:47 2020 +0200
+++ b/ProjectDjangoTagsMenu/TimezoneSelectionDialog.py	Wed Oct 14 18:55:22 2020 +0200
@@ -576,6 +576,6 @@
         """
         dlg = TimezoneSelectionDialog(parent)
         tz = ""
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             tz = dlg.getData()
         return tz, bool(tz)