eric6/Project/ProjectFormsBrowser.py

branch
without_py2_and_pyqt4
changeset 7192
a22eee00b052
parent 7050
b66cac9a6560
child 7201
6b42677d7043
--- a/eric6/Project/ProjectFormsBrowser.py	Sat Aug 31 12:29:57 2019 +0200
+++ b/eric6/Project/ProjectFormsBrowser.py	Sat Aug 31 12:58:11 2019 +0200
@@ -8,10 +8,6 @@
 """
 
 from __future__ import unicode_literals
-try:
-    str = unicode
-except NameError:
-    pass
 
 import os
 import sys
@@ -674,17 +670,17 @@
                 ["Python", "Python2", "Python3"]:
             if self.project.getProjectType() in ["Qt4", ]:
                 self.__uicompiler = Utilities.generatePyQtToolPath(
-                    'pyuic4', ["py3uic4", "py2uic4"])
+                    'pyuic4', ["py3uic4"])
             elif self.project.getProjectType() in ["PyQt5"]:
                 self.__uicompiler = Utilities.generatePyQtToolPath(
-                    'pyuic5', ["py3uic5", "py2uic5"])
+                    'pyuic5', ["py3uic5"])
             elif self.project.getProjectType() in ["E6Plugin"]:
                 if PYQT_VERSION < 0x050000:
                     self.__uicompiler = Utilities.generatePyQtToolPath(
-                        'pyuic4', ["py3uic4", "py2uic4"])
+                        'pyuic4', ["py3uic4"])
                 else:
                     self.__uicompiler = Utilities.generatePyQtToolPath(
-                        'pyuic5', ["py3uic5", "py2uic5"])
+                        'pyuic5', ["py3uic5"])
             elif self.project.getProjectType() == "PySide":
                 self.__uicompiler = \
                     Utilities.generatePySideToolPath('pyside-uic', "1")

eric ide

mercurial