Fixed an issue in GitSubModuleAddDialog caused by PyQt5 prior to 5.6.0 not defining QUrl.None_.

Thu, 18 Jan 2018 11:10:57 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Thu, 18 Jan 2018 11:10:57 +0100
changeset 6070
84e868de5a24
parent 6069
25114fbfb731
child 6072
059c8f981ef4

Fixed an issue in GitSubModuleAddDialog caused by PyQt5 prior to 5.6.0 not defining QUrl.None_.

Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py file | annotate | diff | comparison | revisions
diff -r 25114fbfb731 -r 84e868de5a24 Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py
--- a/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Wed Jan 17 13:41:50 2018 +0100
+++ b/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Thu Jan 18 11:10:57 2018 +0100
@@ -142,8 +142,13 @@
         if path:
             path = self.__getRelativePath(path)
         
+        try:
+            formattingOptions = QUrl.FormattingOptions(QUrl.None_)
+        except AttributeError:
+            # for PyQt < 5.6.0
+            formattingOptions = QUrl.FormattingOptions(0)
         return (
-            url.toString(QUrl.None_),
+            url.toString(formattingOptions),
             self.branchEdit.text(),
             self.nameEdit.text(),
             path,

eric ide

mercurial